mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
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 <hauke@hauke-m.de>
This commit is contained in:
parent
b9aeaf778c
commit
e72b58a78c
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.10 = .219
|
LINUX_VERSION-5.10 = .220
|
||||||
LINUX_KERNEL_HASH-5.10.219 = 93b73f15cc376463e6422cce09ccd9d0a20fb113921ffebddf3352c44d84cd30
|
LINUX_KERNEL_HASH-5.10.220 = 7cc3aff924e9707a5dbf1200c79a7f01617e097b9b175d02bda8ca762aeee19b
|
||||||
|
@ -4047,6 +4047,7 @@ CONFIG_NEW_LEDS=y
|
|||||||
# CONFIG_NFC is not set
|
# CONFIG_NFC is not set
|
||||||
# CONFIG_NFP is not set
|
# CONFIG_NFP is not set
|
||||||
# CONFIG_NFSD is not set
|
# CONFIG_NFSD is not set
|
||||||
|
# CONFIG_NFSD_V2 is not set
|
||||||
# CONFIG_NFSD_V2_ACL is not set
|
# CONFIG_NFSD_V2_ACL is not set
|
||||||
CONFIG_NFSD_V3=y
|
CONFIG_NFSD_V3=y
|
||||||
# CONFIG_NFSD_V3_ACL is not set
|
# CONFIG_NFSD_V3_ACL is not set
|
||||||
|
@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
config MODULES_TREE_LOOKUP
|
config MODULES_TREE_LOOKUP
|
||||||
--- a/kernel/module.c
|
--- a/kernel/module.c
|
||||||
+++ b/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;
|
static const char vermagic[] = VERMAGIC_STRING;
|
||||||
|
|
||||||
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
static int try_to_force_load(struct module *mod, const char *reason)
|
static int try_to_force_load(struct module *mod, const char *reason)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_MODULE_FORCE_LOAD
|
#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;
|
return -ENOEXEC;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
#ifdef CONFIG_MODVERSIONS
|
#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)
|
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
|
||||||
{
|
{
|
||||||
@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
|
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
|
||||||
modmagic = NULL;
|
modmagic = NULL;
|
||||||
|
|
||||||
@@ -3285,6 +3289,7 @@ static int check_modinfo(struct module *
|
@@ -3277,6 +3281,7 @@ static int check_modinfo(struct module *
|
||||||
mod->name);
|
mod->name);
|
||||||
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
|
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/fs/locks.c
|
--- a/fs/locks.c
|
||||||
+++ b/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)
|
static int __init proc_locks_init(void)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user