diff options
| author | John Audia <therealgraysky@proton.me> | 2023-06-28 06:20:03 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-07-05 20:32:37 +0200 |
| commit | b8b49066140eb810474531a48ee3807caa6a694c (patch) | |
| tree | 3deada8616b1bfdbae65e325b14d757e20e3a89c /target/linux/generic/hack-6.1 | |
| parent | 06e64f9b364abe15c27bf0a7225fcac740819668 (diff) | |
| download | upstream-b8b49066140eb810474531a48ee3807caa6a694c.tar.gz upstream-b8b49066140eb810474531a48ee3807caa6a694c.tar.bz2 upstream-b8b49066140eb810474531a48ee3807caa6a694c.zip | |
kernel: bump 6.1 to 6.1.36
All patches automatically rebased.
Acknowledgment to @john-tho for the changes to fs.mk to accommodate new paths
introduced in https://github.com/gregkh/linux/commit/29429a1f5871dbe54ee0da81bb12db8567f15379
Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B
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.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/hack-6.1/902-debloat_proc.patch | 2 |
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 88e2edd289f..b93fe2b725d 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 *, -@@ -2174,9 +2188,11 @@ static void __sk_free(struct sock *sk) +@@ -2168,9 +2182,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 bac3d4af827..5722ac97b1e 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 -@@ -4088,6 +4088,8 @@ static __net_initdata struct pernet_oper +@@ -4082,6 +4082,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { |