aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-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/hack-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/hack-5.10')
-rw-r--r--target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch2
-rw-r--r--target/linux/generic/hack-5.10/902-debloat_proc.patch2
-rw-r--r--target/linux/generic/hack-5.10/904-debloat_dma_buf.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch
index 19b81f0301..4edf527246 100644
--- a/target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch
+++ b/target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch
@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1167,6 +1167,10 @@ config MIPS_MSC
+@@ -1170,6 +1170,10 @@ config MIPS_MSC
config SYNC_R4K
bool
diff --git a/target/linux/generic/hack-5.10/902-debloat_proc.patch b/target/linux/generic/hack-5.10/902-debloat_proc.patch
index e84b6d1787..e9ed09f15a 100644
--- a/target/linux/generic/hack-5.10/902-debloat_proc.patch
+++ b/target/linux/generic/hack-5.10/902-debloat_proc.patch
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -3702,6 +3702,8 @@ static __net_initdata struct pernet_oper
+@@ -3699,6 +3699,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{
diff --git a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
index f6228189da..54e78cedc8 100644
--- a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
+++ b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -3062,6 +3062,7 @@ int wake_up_state(struct task_struct *p,
+@@ -3065,6 +3065,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}