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-01-28 11:03:25 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 18:17:32 +0100
commit3662157d8beda32d95fdc039da0b8114c0c2bb7b (patch)
tree0ffeb568ffc471b47e3633e736e1e801676ef066 /target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
parent662b92614699164396aa38b18f4510333ba64f1d (diff)
downloadupstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.tar.gz
upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.tar.bz2
upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.zip
kernel: bump 4.14 to 4.14.96
Refreshed all patches. Remove upstreamed patches: - 142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 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..35854f323c 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
+@@ -1070,9 +1070,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
+@@ -2970,6 +2967,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice