diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-04-24 12:19:43 +0000 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-04-26 08:53:54 +0200 |
| commit | 9aa196e0f260986991dc8ea65a219f81aed0197e (patch) | |
| tree | 99abd0b8596eb91fb0837c0e49772fc202429cad /target/linux/generic/pending-4.9/920-mangle_bootargs.patch | |
| parent | bdb0de1bbce235244bcd0503c71886409379f4fc (diff) | |
| download | upstream-9aa196e0f260986991dc8ea65a219f81aed0197e.tar.gz upstream-9aa196e0f260986991dc8ea65a219f81aed0197e.tar.bz2 upstream-9aa196e0f260986991dc8ea65a219f81aed0197e.zip | |
kernel: bump 4.9 to 4.9.96
Refresh patches, following required reworking:
ar71xx/patches-4.9/930-chipidea-pullup.patch
layerscape/patches-4.9/302-dts-support-layercape.patch
sunxi/patches-4.9/0052-stmmac-form-4-12.patch
Fixes for CVEs:
CVE-2018-1108
CVE-2018-1092
Tested on: ar71xx Archer C7 v2
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Tested-by: Arjen de Korte <build+openwrt@de-korte.org>
Diffstat (limited to 'target/linux/generic/pending-4.9/920-mangle_bootargs.patch')
| -rw-r--r-- | target/linux/generic/pending-4.9/920-mangle_bootargs.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.9/920-mangle_bootargs.patch b/target/linux/generic/pending-4.9/920-mangle_bootargs.patch index ec2f340097..3422f41519 100644 --- a/target/linux/generic/pending-4.9/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-4.9/920-mangle_bootargs.patch @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> help --- a/init/main.c +++ b/init/main.c -@@ -352,6 +352,29 @@ static inline void setup_nr_cpu_ids(void +@@ -353,6 +353,29 @@ static inline void setup_nr_cpu_ids(void static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> /* * We need to store the untouched command line for future reference. * We also need to store the touched command line since the parameter -@@ -505,6 +528,7 @@ asmlinkage __visible void __init start_k +@@ -506,6 +529,7 @@ asmlinkage __visible void __init start_k pr_notice("%s", linux_banner); setup_arch(&command_line); mm_init_cpumask(&init_mm); |