aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-06-30 15:24:18 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-17 13:22:28 +0200
commitb607b06b91ed598d07f549874aa1f4f9a6240242 (patch)
treeebac12b9a000efc1490c22ed1414527b462fd1a2 /target/linux
parent2fe1b32156a2f28013c2807d1674dd1ced1a6fa1 (diff)
downloadupstream-b607b06b91ed598d07f549874aa1f4f9a6240242.tar.gz
upstream-b607b06b91ed598d07f549874aa1f4f9a6240242.tar.bz2
upstream-b607b06b91ed598d07f549874aa1f4f9a6240242.zip
kernel: bump 5.10 to 5.10.47
No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/hack-5.10/204-module_strip.patch4
-rw-r--r--target/linux/generic/pending-5.10/630-packet_socket_type.patch6
2 files changed, 5 insertions, 5 deletions
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 3379c5f3d6..0a0606042f 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 <nbd@nbd.name>
config MODULES_TREE_LOOKUP
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -3243,9 +3243,11 @@ static int setup_load_info(struct load_i
+@@ -3247,9 +3247,11 @@ static int setup_load_info(struct load_i
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
@@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL;
-@@ -3266,6 +3268,7 @@ static int check_modinfo(struct module *
+@@ -3270,6 +3272,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/pending-5.10/630-packet_socket_type.patch b/target/linux/generic/pending-5.10/630-packet_socket_type.patch
index 6a6e2fdc2a..9e415d803d 100644
--- a/target/linux/generic/pending-5.10/630-packet_socket_type.patch
+++ b/target/linux/generic/pending-5.10/630-packet_socket_type.patch
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -3315,6 +3317,7 @@ static int packet_create(struct net *net
+@@ -3318,6 +3320,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -3949,6 +3952,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3954,6 +3957,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default:
return -ENOPROTOOPT;
}
-@@ -4005,6 +4018,13 @@ static int packet_getsockopt(struct sock
+@@ -4010,6 +4023,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;