[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: kernel: bump 5.18 to 5.18.14 (coolsnowwolf#9823) kernel: bump 5.15 to 5.15.57 (coolsnowwolf#9824)
socgt · Jul 23, 2022 · 7ac99d5 · 7ac99d5
2 parents 8d6e0a9 + d43bee4
commit 7ac99d5
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .56
-LINUX_KERNEL_HASH-5.15.56 = e9a6bb3437f1497b1c74841ebf70d5b96f915d6ac767b5ba3d8d820dd89b8223
+LINUX_VERSION-5.15 = .57
+LINUX_KERNEL_HASH-5.15.57 = 62e3095a1fc876315150c93aad1546cc198e3ba5863b3d7ff7da21fbee20f0fd
diff --git a/include/kernel-5.18 b/include/kernel-5.18
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.18 = .13
-LINUX_KERNEL_HASH-5.18.13 = 430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda
+LINUX_VERSION-5.18 = .14
+LINUX_KERNEL_HASH-5.18.14 = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af
diff --git a/target/linux/generic/hack-5.15/221-module_exports.patch b/target/linux/generic/hack-5.15/221-module_exports.patch
@@ -115,7 +115,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	.previous
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
-@@ -396,7 +396,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
+@@ -397,7 +397,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
  # Linker scripts preprocessor (.lds.S -> .lds)
  # ---------------------------------------------------------------------------
  quiet_cmd_cpp_lds_S = LDS     $@

diff --git a/target/linux/generic/hack-5.18/221-module_exports.patch b/target/linux/generic/hack-5.18/221-module_exports.patch
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	    "__kstrtabns_" #sym ":					\n"	\
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
-@@ -395,7 +395,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
+@@ -396,7 +396,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
  # Linker scripts preprocessor (.lds.S -> .lds)
  # ---------------------------------------------------------------------------
  quiet_cmd_cpp_lds_S = LDS     $@

diff --git a/target/linux/generic/pending-5.15/201-extra_optimization.patch b/target/linux/generic/pending-5.15/201-extra_optimization.patch
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -752,11 +752,11 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
+@@ -759,11 +759,11 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
  KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)
 
  ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE

diff --git a/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		}
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
-@@ -263,6 +263,10 @@ kallsyms()
+@@ -266,6 +266,10 @@ kallsyms()
  		kallsymopt="${kallsymopt} --base-relative"
  	fi
 

diff --git a/target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		}
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
-@@ -264,6 +264,10 @@ kallsyms()
+@@ -267,6 +267,10 @@ kallsyms()
  		kallsymopt="${kallsymopt} --base-relative"
  	fi
 

diff --git a/target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch b/target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch
@@ -21,4 +21,4 @@ Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
 +	.offload_version = 2,
  	.txrx = {
  		.txd_size = sizeof(struct mtk_tx_dma),
- 		.rxd_size = sizeof(struct mtk_rx_dma),
+ 		.rxd_size = sizeof(struct mtk_rx_dma),
diff --git a/target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch b/target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch
@@ -13,10 +13,15 @@
 
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
-@@ -498,6 +498,11 @@ int stmmac_mdio_register(struct net_devi
+@@ -498,6 +498,16 @@ int stmmac_mdio_register(struct net_devi
  	if (priv->plat->has_xgmac)
  		stmmac_xgmac2_mdio_read(new_bus, 0, MII_ADDR_C45);
 
++		stmmac_mdio_write(new_bus,0,31,2627);
++		stmmac_mdio_write(new_bus,0,25,0x1801);
++		stmmac_mdio_write(new_bus,0,31,0);
++		stmmac_mdio_write(new_bus,0,0,0x8000);
++
 +		stmmac_mdio_write(new_bus,0,31,2627);
 +		stmmac_mdio_write(new_bus,0,25,0x1801);
 +		stmmac_mdio_write(new_bus,0,31,0);