From 84f4a3458c0eba8a4f8901830058c2a27051b534 Mon Sep 17 00:00:00 2001 From: sbwml Date: Fri, 10 Jan 2025 12:10:45 +0800 Subject: [PATCH] linux-6.12: bump to 6.12.9 Signed-off-by: sbwml --- openwrt/scripts/01-prepare_base-mainline.sh | 5 ---- tags/kernel-6.12 | 4 +-- ...ockchip-naneng-combphy-fix-phy-reset.patch | 26 ------------------- tags/patches/patch.list | 1 - 4 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 tags/patches/0001-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch delete mode 100644 tags/patches/patch.list diff --git a/openwrt/scripts/01-prepare_base-mainline.sh b/openwrt/scripts/01-prepare_base-mainline.sh index 8a6140d97..0c715ecd6 100644 --- a/openwrt/scripts/01-prepare_base-mainline.sh +++ b/openwrt/scripts/01-prepare_base-mainline.sh @@ -57,11 +57,6 @@ 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 index 6197298a1..364947186 100644 --- a/tags/kernel-6.12 +++ b/tags/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = .8 -LINUX_KERNEL_HASH-6.12.8 = 2291da065ca04b715c89ee50362aec3f021a7414bc963f1b56736682c8122979 +LINUX_VERSION-6.12 = .9 +LINUX_KERNEL_HASH-6.12.9 = 87be0360df0931b340d2bac35161a548070fbc3a8c352c49e21e96666c26aeb4 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 deleted file mode 100644 index cb97b0dc2..000000000 --- a/tags/patches/0001-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1cee5373b2576bff7e1d072d7a5bfee3081b039d Mon Sep 17 00:00:00 2001 -From: sbwml -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 deleted file mode 100644 index bb5da4580..000000000 --- a/tags/patches/patch.list +++ /dev/null @@ -1 +0,0 @@ -0001-Revert-phy-rockchip-naneng-combphy-fix-phy-reset.patch