Skip to content

Commit eeac109

Browse files
[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)
2 parents d396a50 + d43bee4 commit eeac109

9 files changed

+16
-11
lines changed

include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .56
2-
LINUX_KERNEL_HASH-5.15.56 = e9a6bb3437f1497b1c74841ebf70d5b96f915d6ac767b5ba3d8d820dd89b8223
1+
LINUX_VERSION-5.15 = .57
2+
LINUX_KERNEL_HASH-5.15.57 = 62e3095a1fc876315150c93aad1546cc198e3ba5863b3d7ff7da21fbee20f0fd

include/kernel-5.18

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.18 = .13
2-
LINUX_KERNEL_HASH-5.18.13 = 430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda
1+
LINUX_VERSION-5.18 = .14
2+
LINUX_KERNEL_HASH-5.18.14 = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af

target/linux/generic/hack-5.15/221-module_exports.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
115115
.previous
116116
--- a/scripts/Makefile.build
117117
+++ b/scripts/Makefile.build
118-
@@ -396,7 +396,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
118+
@@ -397,7 +397,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
119119
# Linker scripts preprocessor (.lds.S -> .lds)
120120
# ---------------------------------------------------------------------------
121121
quiet_cmd_cpp_lds_S = LDS $@

target/linux/generic/hack-5.18/221-module_exports.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
9191
"__kstrtabns_" #sym ": \n" \
9292
--- a/scripts/Makefile.build
9393
+++ b/scripts/Makefile.build
94-
@@ -395,7 +395,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
94+
@@ -396,7 +396,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
9595
# Linker scripts preprocessor (.lds.S -> .lds)
9696
# ---------------------------------------------------------------------------
9797
quiet_cmd_cpp_lds_S = LDS $@

target/linux/generic/pending-5.15/201-extra_optimization.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1414

1515
--- a/Makefile
1616
+++ b/Makefile
17-
@@ -752,11 +752,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
17+
@@ -759,11 +759,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
1818
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
1919

2020
ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE

target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
106106
}
107107
--- a/scripts/link-vmlinux.sh
108108
+++ b/scripts/link-vmlinux.sh
109-
@@ -263,6 +263,10 @@ kallsyms()
109+
@@ -266,6 +266,10 @@ kallsyms()
110110
kallsymopt="${kallsymopt} --base-relative"
111111
fi
112112

target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
106106
}
107107
--- a/scripts/link-vmlinux.sh
108108
+++ b/scripts/link-vmlinux.sh
109-
@@ -264,6 +264,10 @@ kallsyms()
109+
@@ -267,6 +267,10 @@ kallsyms()
110110
kallsymopt="${kallsymopt} --base-relative"
111111
fi
112112

target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ Signed-off-by: Frank Wunderlich <[email protected]>
2121
+ .offload_version = 2,
2222
.txrx = {
2323
.txd_size = sizeof(struct mtk_tx_dma),
24-
.rxd_size = sizeof(struct mtk_rx_dma),
24+
.rxd_size = sizeof(struct mtk_rx_dma),

target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@
1313

1414
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
1515
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
16-
@@ -498,6 +498,11 @@ int stmmac_mdio_register(struct net_devi
16+
@@ -498,6 +498,16 @@ int stmmac_mdio_register(struct net_devi
1717
if (priv->plat->has_xgmac)
1818
stmmac_xgmac2_mdio_read(new_bus, 0, MII_ADDR_C45);
1919

20+
+ stmmac_mdio_write(new_bus,0,31,2627);
21+
+ stmmac_mdio_write(new_bus,0,25,0x1801);
22+
+ stmmac_mdio_write(new_bus,0,31,0);
23+
+ stmmac_mdio_write(new_bus,0,0,0x8000);
24+
+
2025
+ stmmac_mdio_write(new_bus,0,31,2627);
2126
+ stmmac_mdio_write(new_bus,0,25,0x1801);
2227
+ stmmac_mdio_write(new_bus,0,31,0);

0 commit comments

Comments
 (0)