aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-20 10:32:50 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-21 09:48:48 +0200
commit68a5e662c213f6499b87a38766eae3eb95424062 (patch)
treef2275e7e3c99a61e30dc6ea2532f928f62fcee45 /target/linux/oxnas
parent85294fc5e7012130d3b23a5b23f44a12affa715f (diff)
downloadupstream-68a5e662c213f6499b87a38766eae3eb95424062.tar.gz
upstream-68a5e662c213f6499b87a38766eae3eb95424062.tar.bz2
upstream-68a5e662c213f6499b87a38766eae3eb95424062.zip
kernel: bump 4.14 to 4.14.120
Refreshed all patches. Altered patches: - 0067-generic-Mangle-bootloader-s-kernel-arguments.patch - 006-mvebu-Mangle-bootloader-s-kernel-arguments.patch - 996-generic-Mangle-bootloader-s-kernel-arguments.patch Compile-tested on: cns3xxx, imx6, mvebu Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch
index 2374818dbb..3758ca0dc3 100644
--- a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch
+++ b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch
@@ -184,6 +184,6 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
+ }
+#endif
+
+ /* parameters may set static keys */
+ jump_label_init();
parse_early_param();
- after_dashes = parse_args("Booting kernel",
- static_command_line, __start___param,