aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-11-26 08:29:01 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-27 19:19:30 +0100
commit894f483d203a34618a3c725c808b8811d69c4430 (patch)
treef41f05cf32121486bae9b26bf510251a682ef6de /target/linux/generic/pending-5.10
parentbe077f48124b8bcedd7cdb552c050ce73a42e509 (diff)
downloadupstream-894f483d203a34618a3c725c808b8811d69c4430.tar.gz
upstream-894f483d203a34618a3c725c808b8811d69c4430.tar.bz2
upstream-894f483d203a34618a3c725c808b8811d69c4430.zip
kernel: bump 5.10 to 5.10.82
Removed upstreamed: bcm53xx/patches-5.10/033-v5.16-0014-ARM-dts-NSP-Fix-mpcore-mmc-node-names.patch Manually rebased: ipq806x/patches-5.10/086-ipq8064-fix-duplicate-node.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/300-mips_expose_boot_raw.patch4
1 files changed, 2 insertions, 2 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 240c367e59..cbc0d11293 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
-@@ -1082,9 +1082,6 @@ config FW_ARC
+@@ -1085,9 +1085,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
-@@ -3175,6 +3172,18 @@ choice
+@@ -3178,6 +3175,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice