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> (cherry picked from commit 64782497dbdf124d9f7979ae1aa48f20c9b9dec8)
This commit is contained in:
		
				
					committed by
					
						
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			
						parent
						
							482c57afea
						
					
				
				
					commit
					a23aa1c55a
				
			@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 {
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user