aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2021-12-12 08:19:37 +0100
committerPetr Štetiar <ynezz@true.cz>2021-12-19 08:23:23 +0100
commit1d94f72439034c112bfa4b694fc736123f4890a5 (patch)
treec0c916ea430038c38dfe0eec583ec31dacd2b6af /target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
parentcc8c1be438a3d19fec06b72b1e7854f31b9e2f71 (diff)
downloadupstream-1d94f72439034c112bfa4b694fc736123f4890a5.tar.gz
upstream-1d94f72439034c112bfa4b694fc736123f4890a5.tar.bz2
upstream-1d94f72439034c112bfa4b694fc736123f4890a5.zip
kernel: bump 4.14 to 4.14.258
Rebased patches: * generic: 273-batman-adv-Convert-packet.h-to-uapi-header.patch * ipq806x: 0065-arm-override-compiler-flags.patch * mvebu: 513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch Removed patches: Fixed upstream: * ar71xx: 821-serial-core-add-support-for-boot-console-with-arbitr.patch * ath79: 921-serial-core-add-support-for-boot-console-with-arbitr.patch - in 4.14.256 via 9112e7ef87149b3d8093e7446d784117f6e18d69 * mvebu: 527-PCI-aardvark-allow-to-specify-link-capability.patch - in 4.14.257 via 62a3dc9b65a2b24800fc4267b8cf590fad135034 * mvebu: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch - should be hopefully fixed by the bunch of changes in .256 and .257 Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia. Fixes: CVE-2021-3640 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch')
-rw-r--r--target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
index f305e75650..5caa00ad26 100644
--- a/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
@@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1069,9 +1069,6 @@ config FW_ARC
+@@ -1072,9 +1072,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
-@@ -2969,6 +2966,18 @@ choice
+@@ -2973,6 +2970,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice