diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-08-11 18:13:35 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-08-11 23:17:31 +0200 |
| commit | 59dce3b595b0477bef991f6504d28fbd89cc8b4d (patch) | |
| tree | 69688411d819670b03f30e83c8d5bc2c84ecaf0b /target/linux/generic/pending-5.10 | |
| parent | f6b6d4b2f0cb3ba12c18d5a89560fb658a954d22 (diff) | |
| download | upstream-59dce3b595b0477bef991f6504d28fbd89cc8b4d.tar.gz upstream-59dce3b595b0477bef991f6504d28fbd89cc8b4d.tar.bz2 upstream-59dce3b595b0477bef991f6504d28fbd89cc8b4d.zip | |
kernel: bump 5.10 to 5.10.189
All patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.10')
| -rw-r--r-- | target/linux/generic/pending-5.10/300-mips_expose_boot_raw.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/pending-5.10/920-mangle_bootargs.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.10/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-5.10/300-mips_expose_boot_raw.patch index 706c5dee22..ee3fc5e108 100644 --- a/target/linux/generic/pending-5.10/300-mips_expose_boot_raw.patch +++ b/target/linux/generic/pending-5.10/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 -@@ -1085,9 +1085,6 @@ config FW_ARC +@@ -1086,9 +1086,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 -@@ -3182,6 +3179,18 @@ choice +@@ -3183,6 +3180,18 @@ choice bool "Extend builtin kernel arguments with bootloader arguments" endchoice diff --git a/target/linux/generic/pending-5.10/920-mangle_bootargs.patch b/target/linux/generic/pending-5.10/920-mangle_bootargs.patch index 390152078f..72a5ca4d2f 100644 --- a/target/linux/generic/pending-5.10/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.10/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 -@@ -608,6 +608,29 @@ static inline void setup_nr_cpu_ids(void +@@ -606,6 +606,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 -@@ -869,6 +892,7 @@ asmlinkage __visible void __init __no_sa +@@ -866,6 +889,7 @@ asmlinkage __visible void __init __no_sa pr_notice("%s", linux_banner); early_security_init(); setup_arch(&command_line); |