From e72b58a78c27a2ba5d7959ed633d3960a75fec07 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 30 Jun 2024 16:25:44 +0200 Subject: [PATCH] kernel: bump 5.10 to 5.10.220 No manual changes needed. Link: https://github.com/openwrt/openwrt/pull/15843 Signed-off-by: Hauke Mehrtens --- include/kernel-5.10 | 4 ++-- target/linux/generic/config-5.10 | 1 + target/linux/generic/hack-5.10/204-module_strip.patch | 8 ++++---- target/linux/generic/hack-5.10/902-debloat_proc.patch | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 5c8eca928f4..90467d65a46 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .219 -LINUX_KERNEL_HASH-5.10.219 = 93b73f15cc376463e6422cce09ccd9d0a20fb113921ffebddf3352c44d84cd30 +LINUX_VERSION-5.10 = .220 +LINUX_KERNEL_HASH-5.10.220 = 7cc3aff924e9707a5dbf1200c79a7f01617e097b9b175d02bda8ca762aeee19b diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index bc9fbbeaecb..ffd29503ea7 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -4047,6 +4047,7 @@ CONFIG_NEW_LEDS=y # CONFIG_NFC is not set # CONFIG_NFP is not set # CONFIG_NFSD is not set +# CONFIG_NFSD_V2 is not set # CONFIG_NFSD_V2_ACL is not set CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set diff --git a/target/linux/generic/hack-5.10/204-module_strip.patch b/target/linux/generic/hack-5.10/204-module_strip.patch index 47b86254e00..ffa702d20d8 100644 --- a/target/linux/generic/hack-5.10/204-module_strip.patch +++ b/target/linux/generic/hack-5.10/204-module_strip.patch @@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -1285,6 +1285,7 @@ static struct module_attribute *modinfo_ +@@ -1277,6 +1277,7 @@ static struct module_attribute *modinfo_ static const char vermagic[] = VERMAGIC_STRING; @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau static int try_to_force_load(struct module *mod, const char *reason) { #ifdef CONFIG_MODULE_FORCE_LOAD -@@ -1296,6 +1297,7 @@ static int try_to_force_load(struct modu +@@ -1288,6 +1289,7 @@ static int try_to_force_load(struct modu return -ENOEXEC; #endif } @@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau #ifdef CONFIG_MODVERSIONS -@@ -3262,9 +3264,11 @@ static int setup_load_info(struct load_i +@@ -3254,9 +3256,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3285,6 +3289,7 @@ static int check_modinfo(struct module * +@@ -3277,6 +3281,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } 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 d5440e4191d..8bb572e42e7 100644 --- a/target/linux/generic/hack-5.10/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.10/902-debloat_proc.patch @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau --- a/fs/locks.c +++ b/fs/locks.c -@@ -3016,6 +3016,8 @@ static const struct seq_operations locks +@@ -3076,6 +3076,8 @@ static const struct seq_operations locks static int __init proc_locks_init(void) {