aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-11-21 08:39:18 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-27 19:19:11 +0100
commitbe077f48124b8bcedd7cdb552c050ce73a42e509 (patch)
treee837e50dd01176b0f694b5701ee8575f30352698 /target/linux/generic/pending-5.10
parent553a3ac221e92c6fad9ffa9229b18a4e77e42c23 (diff)
downloadupstream-be077f48124b8bcedd7cdb552c050ce73a42e509.tar.gz
upstream-be077f48124b8bcedd7cdb552c050ce73a42e509.tar.bz2
upstream-be077f48124b8bcedd7cdb552c050ce73a42e509.zip
kernel: bump 5.10 to 5.10.81
Manually rebased: octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, ipq806x/R7800 Run-tested: bcm2711/RPi4B, ipq806x/R7800 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/pending-5.10')
-rw-r--r--target/linux/generic/pending-5.10/920-mangle_bootargs.patch4
1 files changed, 2 insertions, 2 deletions
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 e5b7fd81d1..d8f5c06b7e 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
-@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -608,6 +608,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
-@@ -868,6 +891,7 @@ asmlinkage __visible void __init __no_sa
+@@ -869,6 +892,7 @@ asmlinkage __visible void __init __no_sa
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);