kernel: bump 5.18 to 5.18.14 (coolsnowwolf#9823)

Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>
rollensu · Jul 23, 2022 · d43bee4 · d43bee4
1 parent 4ad9acd
commit d43bee4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
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.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.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/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);