Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: bump 5.18 to 5.18.14 #9823

Merged
merged 1 commit into from
Jul 23, 2022
+10 −5
Merged

kernel: bump 5.18 to 5.18.14 #9823

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
kernel: bump 5.18 to 5.18.14 
Signed-off-by: aakkll <[email protected]>
@aakkll
aakkll committed Jul 23, 2022
commit c361a520c609d604e00d88ff4c1d85756127e837
4 changes: 2 additions & 2 deletions include/kernel-5.18
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.18/221-module_exports.patch
View file
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
"__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 $@
2 changes: 1 addition & 1 deletion target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch
View file
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
}
--- 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

7 changes: 6 additions & 1 deletion target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch
View file
Original file line number Diff line number Diff line change
@@ -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);