aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-12-18 16:40:13 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-12-25 15:55:41 +0100
commit27dddb67c0cfedc86c4ccfea6c50ed5f1cf3894d (patch)
tree023cbaf378fad1c5aa5128e821d6f6ba0d573522 /target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
parent8623b58c1d1cccc5986f1c306b0959d3514987b4 (diff)
downloadupstream-27dddb67c0cfedc86c4ccfea6c50ed5f1cf3894d.tar.gz
upstream-27dddb67c0cfedc86c4ccfea6c50ed5f1cf3894d.tar.bz2
upstream-27dddb67c0cfedc86c4ccfea6c50ed5f1cf3894d.zip
kernel: bump 4.14 to 4.14.159
Refreshed all patches. Fixes: - CVE-2019-19332 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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 5384be15ca..71dff9b930 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
-@@ -1067,9 +1067,6 @@ config FW_ARC
+@@ -1068,9 +1068,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
-@@ -2967,6 +2964,18 @@ choice
+@@ -2968,6 +2965,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice