From 71b2b32f98d5f359818458334fc4109c16a926ee Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 1 Nov 2020 11:37:10 -0500 Subject: kernel: bump 5.4 to 5.4.74 Removed upstreamed patches: mvebu/patches-5.4 409-phy-marvell-comphy-Convert-internal-SMCC-firmware-re.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, x86_64 Run-tested: ipq806x/R7800, x86_64, lantiq/Easybox 904 xDSL No dmesg regressions, everything functional Signed-off-by: John Audia Tested-by: Curtis Deptuck [x86_64 build/run] [added lantiq test report] Signed-off-by: Adrian Schmutzler --- target/linux/generic/hack-5.4/901-debloat_sock_diag.patch | 2 +- target/linux/generic/hack-5.4/902-debloat_proc.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic') 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 e97c26a858..7c9046c6e3 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 struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) { struct dst_entry *dst = __sk_dst_get(sk); -@@ -1743,9 +1756,11 @@ static void __sk_free(struct sock *sk) +@@ -1742,9 +1755,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 7c9d01f2bf..d9febbada8 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 --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3630,6 +3630,8 @@ static __net_initdata struct pernet_oper +@@ -3629,6 +3629,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { -- cgit v1.2.3