linux-6.12: bump to 6.12.8

Signed-off-by: sbwml <[email protected]>
sbwml · Jan 3, 2025 · 8fd029b · 8fd029b
1 parent 1341276
commit 8fd029b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git a/openwrt/24-config-common b/openwrt/24-config-common
@@ -183,6 +183,7 @@ CONFIG_PACKAGE_kmod-usb-net-rndis=y
 CONFIG_PACKAGE_kmod-usb-net-ipheth=y
 
 ### Kernel Modules
+CONFIG_PACKAGE_kmod-bonding=y
 CONFIG_PACKAGE_kmod-br-netfilter=y
 CONFIG_PACKAGE_kmod-button-hotplug=y
 CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=y

diff --git a/openwrt/24-config-minimal-common b/openwrt/24-config-minimal-common
@@ -113,6 +113,7 @@ CONFIG_PACKAGE_kmod-usb-net-rndis=y
 CONFIG_PACKAGE_kmod-usb-net-ipheth=y
 
 ### Kernel Modules
+CONFIG_PACKAGE_kmod-bonding=y
 CONFIG_PACKAGE_kmod-br-netfilter=y
 CONFIG_PACKAGE_kmod-button-hotplug=y
 CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=y

diff --git a/openwrt/scripts/01-prepare_base-mainline.sh b/openwrt/scripts/01-prepare_base-mainline.sh
@@ -57,6 +57,11 @@ else
 fi
 cp -a target/linux/generic-6.12/* target/linux/generic
 
+# additional patches
+curl -s $mirror/tags/patches/patch.list | while read -r patch_file; do
+    curl -s $mirror/tags/patches/$patch_file > target/linux/generic/hack-6.12/$patch_file
+done
+
 # bcm53xx - fix build kernel with clang
 [ "$platform" = "bcm53xx" ] && [ "$KERNEL_CLANG_LTO" = "y" ] && rm -f target/linux/generic/hack-6.6/220-arm-gc_sections.patch target/linux/generic/hack-6.12/220-arm-gc_sections.patch
 

diff --git a/tags/kernel-6.12 b/tags/kernel-6.12
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .6
-LINUX_KERNEL_HASH-6.12.6 = d450ab215de4e1f8bb85e0f4216760fa33fd024b4526b144f4ce0d9012b29c9e
+LINUX_VERSION-6.12 = .8
+LINUX_KERNEL_HASH-6.12.8 = 2291da065ca04b715c89ee50362aec3f021a7414bc963f1b56736682c8122979
diff --git a/tags/patches/0001-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch b/tags/patches/0001-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch
@@ -0,0 +1,26 @@
+From 1cee5373b2576bff7e1d072d7a5bfee3081b039d Mon Sep 17 00:00:00 2001
+From: sbwml <[email protected]>
+Date: Fri, 3 Jan 2025 21:24:06 +0800
+Subject: [PATCH] Revert "phy: rockchip: naneng-combphy: fix phy reset"
+
+This reverts commit 5cdf336412a928ae0f05a3117b3132366a1f7d21.
+---
+ drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+index 2eb3329ca..0a9989e41 100644
+--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
++++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+@@ -309,7 +309,7 @@ static int rockchip_combphy_parse_dt(struct device *dev, struct rockchip_combphy
+
+ 	priv->ext_refclk = device_property_present(dev, "rockchip,ext-refclk");
+
+-	priv->phy_rst = devm_reset_control_get(dev, "phy");
++	priv->phy_rst = devm_reset_control_array_get_exclusive(dev);
+ 	if (IS_ERR(priv->phy_rst))
+ 		return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy reset\n");
+
+-- 
+2.42.0
+
diff --git a/tags/patches/patch.list b/tags/patches/patch.list
@@ -0,0 +1 @@
+0001-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0001-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch