aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-10-07 06:24:12 -0400
committerDaniel Golle <daniel@makrotopia.org>2021-10-10 00:12:10 +0100
commit416eef7209f3d7c7ab27c90dc4d851d78fff2d44 (patch)
treed259a174534f7c9c7dda26a02597a1414bf06d48 /target/linux/generic/hack-5.4
parente672d1b387604b71058b5c9edc9234fc7efebb25 (diff)
downloadupstream-416eef7209f3d7c7ab27c90dc4d851d78fff2d44.tar.gz
upstream-416eef7209f3d7c7ab27c90dc4d851d78fff2d44.tar.bz2
upstream-416eef7209f3d7c7ab27c90dc4d851d78fff2d44.zip
kernel: bump 5.4 to 5.4.151
All patches automatically rebased. Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/hack-5.4')
-rw-r--r--target/linux/generic/hack-5.4/901-debloat_sock_diag.patch2
-rw-r--r--target/linux/generic/hack-5.4/902-debloat_proc.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.4/901-debloat_sock_diag.patch b/target/linux/generic/hack-5.4/901-debloat_sock_diag.patch
index 7c9046c6e3..0abb672639 100644
--- a/target/linux/generic/hack-5.4/901-debloat_sock_diag.patch
+++ b/target/linux/generic/hack-5.4/901-debloat_sock_diag.patch
@@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
{
struct dst_entry *dst = __sk_dst_get(sk);
-@@ -1742,9 +1755,11 @@ static void __sk_free(struct sock *sk)
+@@ -1760,9 +1773,11 @@ static void __sk_free(struct sock *sk)
if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1);
diff --git a/target/linux/generic/hack-5.4/902-debloat_proc.patch b/target/linux/generic/hack-5.4/902-debloat_proc.patch
index f8ee3f083b..042588a623 100644
--- a/target/linux/generic/hack-5.4/902-debloat_proc.patch
+++ b/target/linux/generic/hack-5.4/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
-@@ -3623,6 +3623,8 @@ static __net_initdata struct pernet_oper
+@@ -3643,6 +3643,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{