diff options
| author | John Audia <therealgraysky@proton.me> | 2023-08-11 14:48:41 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-08-13 13:03:43 +0200 |
| commit | 64782497dbdf124d9f7979ae1aa48f20c9b9dec8 (patch) | |
| tree | 41504d8eefbf1ec4a611b8e7b68dff9effb23522 /target/linux/generic | |
| parent | 16c37ba9136ff431c7e3c97cc27e4ea166b8020a (diff) | |
| download | upstream-64782497dbdf124d9f7979ae1aa48f20c9b9dec8.tar.gz upstream-64782497dbdf124d9f7979ae1aa48f20c9b9dec8.tar.bz2 upstream-64782497dbdf124d9f7979ae1aa48f20c9b9dec8.zip | |
kernel: bump 5.15 to 5.15.126
1. Disable unneeded errata Kconfig symbols
2. Update kernel
Changelog: https://lore.kernel.org/stable/2023081111-unlocking-synopsis-d7d5@gregkh/
All patches automatically rebased.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/config-5.15 | 4 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.15/901-debloat_sock_diag.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.15/902-debloat_proc.patch | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index d7e4742d633..de619f60b68 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -330,6 +330,10 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 # CONFIG_ARM64_ERRATUM_1530923 is not set # CONFIG_ARM64_ERRATUM_1542419 is not set # CONFIG_ARM64_ERRATUM_1742098 is not set +# CONFIG_ARM64_ERRATUM_2253138 is not set +# CONFIG_ARM64_ERRATUM_2224489 is not set +# CONFIG_ARM64_ERRATUM_2054223 is not set +# CONFIG_ARM64_ERRATUM_2067961 is not set # CONFIG_ARM64_ERRATUM_2441007 is not set # CONFIG_ARM64_ERRATUM_2441009 is not set # CONFIG_ARM64_ERRATUM_819472 is not set diff --git a/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch b/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch index 1f3802aa5b3..5c1ce01a2ce 100644 --- a/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch @@ -77,7 +77,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 *, -@@ -1983,9 +1997,11 @@ static void __sk_free(struct sock *sk) +@@ -1986,9 +2000,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.15/902-debloat_proc.patch b/target/linux/generic/hack-5.15/902-debloat_proc.patch index b1c1c8171c1..8039d4161a2 100644 --- a/target/linux/generic/hack-5.15/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.15/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 -@@ -3877,6 +3877,8 @@ static __net_initdata struct pernet_oper +@@ -3880,6 +3880,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { |