aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-6.1
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-08-11 12:39:29 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-08-12 12:10:36 +0200
commit093d317d20bbaa553598dbabf2b04d331131f6d1 (patch)
tree5695eef552fb870fb6044caad649092d1b304b81 /target/linux/generic/hack-6.1
parenta0a5b976746b6bbe94c664ac17efc95ce944f8d1 (diff)
downloadupstream-093d317d20bbaa553598dbabf2b04d331131f6d1.tar.gz
upstream-093d317d20bbaa553598dbabf2b04d331131f6d1.tar.bz2
upstream-093d317d20bbaa553598dbabf2b04d331131f6d1.zip
kernel: bump 6.1 to 6.1.45
Changelog: https://lore.kernel.org/stable/2023081123-ion-ferment-1ce5@gregkh/ All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> #x86_64 (j1900) Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/hack-6.1')
-rw-r--r--target/linux/generic/hack-6.1/901-debloat_sock_diag.patch2
-rw-r--r--target/linux/generic/hack-6.1/902-debloat_proc.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-6.1/901-debloat_sock_diag.patch b/target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
index b93fe2b725d..6cd30813a5d 100644
--- a/target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
+++ b/target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
@@ -79,7 +79,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
u32));
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
-@@ -2168,9 +2182,11 @@ static void __sk_free(struct sock *sk)
+@@ -2175,9 +2189,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-6.1/902-debloat_proc.patch b/target/linux/generic/hack-6.1/902-debloat_proc.patch
index b035f04ba23..1b7b72f44df 100644
--- a/target/linux/generic/hack-6.1/902-debloat_proc.patch
+++ b/target/linux/generic/hack-6.1/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
-@@ -4093,6 +4093,8 @@ static __net_initdata struct pernet_oper
+@@ -4100,6 +4100,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{