From 4a0839b44ede74754f8022ca7fbd31c862ca86c2 Mon Sep 17 00:00:00 2001 From: John Audia Date: Fri, 2 Feb 2024 16:56:39 -0500 Subject: kernel: bump 6.1 to 6.1.76 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.76 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia --- .../linux/generic/hack-6.1/410-block-fit-partition-parser.patch | 2 +- target/linux/generic/hack-6.1/901-debloat_sock_diag.patch | 8 ++++---- target/linux/generic/hack-6.1/902-debloat_proc.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/generic/hack-6.1') diff --git a/target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch b/target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch index 1258f64722..3e45646fdb 100644 --- a/target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch @@ -105,7 +105,7 @@ Subject: [PATCH] kernel: add block fit partition parser /* everything is up and running, commence */ err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL); if (err) -@@ -585,6 +597,11 @@ static bool blk_add_partition(struct gen +@@ -590,6 +602,11 @@ static bool blk_add_partition(struct gen (state->parts[p].flags & ADDPART_FLAG_RAID)) md_autodetect_dev(part->bd_dev); 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 ffa6e8ac60..ec71f9af4b 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 @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau obj-$(CONFIG_PROC_FS) += net-procfs.o --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -114,6 +114,7 @@ +@@ -115,6 +115,7 @@ #include #include #include @@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau #include -@@ -145,6 +146,7 @@ +@@ -146,6 +147,7 @@ static DEFINE_MUTEX(proto_list_mutex); static LIST_HEAD(proto_list); @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau static void sock_def_write_space_wfree(struct sock *sk); static void sock_def_write_space(struct sock *sk); -@@ -584,6 +586,18 @@ discard_and_relse: +@@ -585,6 +587,18 @@ discard_and_relse: } EXPORT_SYMBOL(__sk_receive_skb); @@ -79,7 +79,7 @@ Signed-off-by: Felix Fietkau 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 *, -@@ -2187,9 +2201,11 @@ static void __sk_free(struct sock *sk) +@@ -2188,9 +2202,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 0d844994aa..a90169efc9 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 --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -4113,6 +4113,8 @@ static __net_initdata struct pernet_oper +@@ -4114,6 +4114,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { -- cgit v1.2.3