aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-08-13 00:16:29 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-08-14 16:32:34 +0100
commit6ec859d23155583fc04311aeba72ffacaaac1a3f (patch)
treecb7b9e82690c420d09fd88107d92cab692e978f5 /target/linux/generic/hack-5.10
parentce2f31254ad6af35c8cba7e71b708e11d8af5249 (diff)
downloadupstream-6ec859d23155583fc04311aeba72ffacaaac1a3f.tar.gz
upstream-6ec859d23155583fc04311aeba72ffacaaac1a3f.tar.bz2
upstream-6ec859d23155583fc04311aeba72ffacaaac1a3f.zip
kernel: bump 5.10 to 5.10.58
No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-5.10')
-rw-r--r--target/linux/generic/hack-5.10/205-kconfig-exit.patch2
-rw-r--r--target/linux/generic/hack-5.10/904-debloat_dma_buf.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.10/205-kconfig-exit.patch b/target/linux/generic/hack-5.10/205-kconfig-exit.patch
index 8931ad3270..c3fb7a1f99 100644
--- a/target/linux/generic/hack-5.10/205-kconfig-exit.patch
+++ b/target/linux/generic/hack-5.10/205-kconfig-exit.patch
@@ -1,6 +1,6 @@
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
-@@ -212,6 +212,8 @@ static int conf_sym(struct menu *menu)
+@@ -215,6 +215,8 @@ static int conf_sym(struct menu *menu)
break;
continue;
case 0:
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 2f5f685063..4ed40bb63d 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
@@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -3051,6 +3051,7 @@ int wake_up_state(struct task_struct *p,
+@@ -3049,6 +3049,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}