kernel: bump 5.15 to 5.15.126
authorJohn Audia <therealgraysky@proton.me>
Fri, 11 Aug 2023 18:48:41 +0000 (14:48 -0400)
committerHauke Mehrtens <hauke@hauke-m.de>
Tue, 15 Aug 2023 15:11:39 +0000 (17:11 +0200)
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>
(cherry picked from commit 64782497dbdf124d9f7979ae1aa48f20c9b9dec8)

include/kernel-5.15
target/linux/bcm4908/patches-5.15/700-net-dsa-bcm_sf2-enable-GPHY-for-switch-probing.patch
target/linux/bcm4908/patches-5.15/701-net-dsa-bcm_sf2-keep-GPHY-enabled-on-the-BCM4908.patch
target/linux/generic/config-5.15
target/linux/generic/hack-5.15/901-debloat_sock_diag.patch
target/linux/generic/hack-5.15/902-debloat_proc.patch
target/linux/mediatek/patches-5.15/901-arm-add-cmdline-override.patch

index 43e03fac8d10ed00a8fc3f6d23d15ccd285bc609..7687c40aa8cf591737575821e28ba4d826b4c062 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .125
-LINUX_KERNEL_HASH-5.15.125 = 150f3846b76cd23a6135f49cef71372bade5a06e851cb4f8558df8b862d8fec7
+LINUX_VERSION-5.15 = .126
+LINUX_KERNEL_HASH-5.15.126 = adf4aab9840f89ee151b837defbe16e9f388e8eef20df7ee94bf63be33b3ed6f
index af1c9bcefd595bd11eca25beb415913f6a217200..ba09c562aebae6f0966ef7c73ec72989a61257fd 100644 (file)
@@ -29,7 +29,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -1538,10 +1538,14 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1542,10 +1542,14 @@ static int bcm_sf2_sw_probe(struct platf
        rev = reg_readl(priv, REG_PHY_REVISION);
        priv->hw_params.gphy_rev = rev & PHY_REVISION_MASK;
  
index e78b4a47d70cf5a4ba88060b67c9297e2d67ec5d..b5baa8717e4aabd8d7a1410cbcfdbe35a3044ff9 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -1552,6 +1552,12 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1556,6 +1556,12 @@ static int bcm_sf2_sw_probe(struct platf
                 priv->hw_params.core_rev >> 8, priv->hw_params.core_rev & 0xff,
                 priv->irq0, priv->irq1);
  
index 637b845ac4fdfd5d2b0a38b169e1141a8e4a694d..5cac839f593c704a8f5bc38b55102644773481b1 100644 (file)
@@ -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
index ac502bdd16d6668b1cc898c9fc360a6f4fde5ebd..ac53bd02812bf6f9f40744627223f04922e42382 100644 (file)
@@ -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);
  
index b1c1c8171c122c40bcc2d9143f018ce8cebc5c41..8039d4161a250514f6ddd1d0d88ed6743a755d98 100644 (file)
@@ -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)
  {
index a22a1124e9d6e2d4b345d108bdf86ae6af158a08..5ded06ff63f6178b64967246880259dc2562a0e9 100644 (file)
@@ -37,7 +37,7 @@
         * managed to set the command line, unless CONFIG_CMDLINE_FORCE
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -1983,6 +1983,14 @@ config CMDLINE_FORCE
+@@ -2057,6 +2057,14 @@ config CMDLINE_FORCE
  
  endchoice