diff --git a/include/kernel-5.18 b/include/kernel-5.18 index a8b82aa4c5652d..927d35b948711b 100644 --- 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 index 43a91785894c07..b69143b481a9f9 100644 --- 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 "__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 index 77bef1795917a1..1412a80148b034 100644 --- 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 } --- 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 index 50d8d9a9d8cf79..1138b55e71bb3e 100644 --- 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);