diff --git a/target/linux/ipq40xx/config-6.12 b/target/linux/ipq40xx/config-6.18
similarity index 100%
rename from target/linux/ipq40xx/config-6.12
rename to target/linux/ipq40xx/config-6.18
diff --git a/target/linux/ipq40xx/patches-6.12/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch b/target/linux/ipq40xx/patches-6.18/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch
rename to target/linux/ipq40xx/patches-6.18/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch
diff --git a/target/linux/ipq40xx/patches-6.12/104-clk-fix-apss-cpu-overclocking.patch b/target/linux/ipq40xx/patches-6.18/104-clk-fix-apss-cpu-overclocking.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/104-clk-fix-apss-cpu-overclocking.patch
rename to target/linux/ipq40xx/patches-6.18/104-clk-fix-apss-cpu-overclocking.patch
diff --git a/target/linux/ipq40xx/patches-6.12/301-arm-compressed-add-appended-DTB-section.patch b/target/linux/ipq40xx/patches-6.18/301-arm-compressed-add-appended-DTB-section.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/301-arm-compressed-add-appended-DTB-section.patch
rename to target/linux/ipq40xx/patches-6.18/301-arm-compressed-add-appended-DTB-section.patch
diff --git a/target/linux/ipq40xx/patches-6.12/302-arm-compressed-set-ipq40xx-watchdog-to-allow-boot.patch b/target/linux/ipq40xx/patches-6.18/302-arm-compressed-set-ipq40xx-watchdog-to-allow-boot.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/302-arm-compressed-set-ipq40xx-watchdog-to-allow-boot.patch
rename to target/linux/ipq40xx/patches-6.18/302-arm-compressed-set-ipq40xx-watchdog-to-allow-boot.patch
diff --git a/target/linux/ipq40xx/patches-6.12/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch b/target/linux/ipq40xx/patches-6.18/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch
rename to target/linux/ipq40xx/patches-6.18/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch
diff --git a/target/linux/ipq40xx/patches-6.12/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch b/target/linux/ipq40xx/patches-6.18/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch
rename to target/linux/ipq40xx/patches-6.18/401-mmc-sdhci-msm-comment-unused-sdhci_msm_set_clock.patch
diff --git a/target/linux/ipq40xx/patches-6.12/422-firmware-qcom-scm-fix-SCM-cold-boot-address.patch b/target/linux/ipq40xx/patches-6.18/422-firmware-qcom-scm-fix-SCM-cold-boot-address.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/422-firmware-qcom-scm-fix-SCM-cold-boot-address.patch
rename to target/linux/ipq40xx/patches-6.18/422-firmware-qcom-scm-fix-SCM-cold-boot-address.patch
diff --git a/target/linux/ipq40xx/patches-6.12/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch b/target/linux/ipq40xx/patches-6.18/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
rename to target/linux/ipq40xx/patches-6.18/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
diff --git a/target/linux/ipq40xx/patches-6.12/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch b/target/linux/ipq40xx/patches-6.18/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch
rename to target/linux/ipq40xx/patches-6.18/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch
diff --git a/target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch b/target/linux/ipq40xx/patches-6.18/701-net-dsa-add-out-of-band-tagging-protocol.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/701-net-dsa-add-out-of-band-tagging-protocol.patch
rename to target/linux/ipq40xx/patches-6.18/701-net-dsa-add-out-of-band-tagging-protocol.patch
diff --git a/target/linux/ipq40xx/patches-6.12/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch b/target/linux/ipq40xx/patches-6.18/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch
rename to target/linux/ipq40xx/patches-6.18/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch
diff --git a/target/linux/ipq40xx/patches-6.12/703-net-qualcomm-ipqess-release-IRQ-s-on-network-device-.patch b/target/linux/ipq40xx/patches-6.18/703-net-qualcomm-ipqess-release-IRQ-s-on-network-device-.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/703-net-qualcomm-ipqess-release-IRQ-s-on-network-device-.patch
rename to target/linux/ipq40xx/patches-6.18/703-net-qualcomm-ipqess-release-IRQ-s-on-network-device-.patch
diff --git a/target/linux/ipq40xx/patches-6.12/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch b/target/linux/ipq40xx/patches-6.18/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch
rename to target/linux/ipq40xx/patches-6.18/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch
diff --git a/target/linux/ipq40xx/patches-6.12/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch b/target/linux/ipq40xx/patches-6.18/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch
rename to target/linux/ipq40xx/patches-6.18/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch
diff --git a/target/linux/ipq40xx/patches-6.12/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch b/target/linux/ipq40xx/patches-6.18/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
rename to target/linux/ipq40xx/patches-6.18/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
diff --git a/target/linux/ipq40xx/patches-6.12/707-arm-dts-ipq4019-add-switch-node.patch b/target/linux/ipq40xx/patches-6.18/707-arm-dts-ipq4019-add-switch-node.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/707-arm-dts-ipq4019-add-switch-node.patch
rename to target/linux/ipq40xx/patches-6.18/707-arm-dts-ipq4019-add-switch-node.patch
diff --git a/target/linux/ipq40xx/patches-6.12/710-arm-dts-ipq4019-QCA807x-properties.patch b/target/linux/ipq40xx/patches-6.18/710-arm-dts-ipq4019-QCA807x-properties.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/710-arm-dts-ipq4019-QCA807x-properties.patch
rename to target/linux/ipq40xx/patches-6.18/710-arm-dts-ipq4019-QCA807x-properties.patch
diff --git a/target/linux/ipq40xx/patches-6.12/711-net-qualcomm-ipqess-fix-TX-timeout-errors.patch b/target/linux/ipq40xx/patches-6.18/711-net-qualcomm-ipqess-fix-TX-timeout-errors.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/711-net-qualcomm-ipqess-fix-TX-timeout-errors.patch
rename to target/linux/ipq40xx/patches-6.18/711-net-qualcomm-ipqess-fix-TX-timeout-errors.patch
diff --git a/target/linux/ipq40xx/patches-6.12/712-ARM-dts-qcom-ipq4019-add-reference-label-for-PCIe.patch b/target/linux/ipq40xx/patches-6.18/712-ARM-dts-qcom-ipq4019-add-reference-label-for-PCIe.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/712-ARM-dts-qcom-ipq4019-add-reference-label-for-PCIe.patch
rename to target/linux/ipq40xx/patches-6.18/712-ARM-dts-qcom-ipq4019-add-reference-label-for-PCIe.patch
diff --git a/target/linux/ipq40xx/patches-6.12/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq40xx/patches-6.18/850-soc-add-qualcomm-syscon.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/850-soc-add-qualcomm-syscon.patch
rename to target/linux/ipq40xx/patches-6.18/850-soc-add-qualcomm-syscon.patch
diff --git a/target/linux/ipq40xx/patches-6.12/900-PCI-qcom-add-hack-compatible-for-ipq4019-Lantiq-DSL.patch b/target/linux/ipq40xx/patches-6.18/900-PCI-qcom-add-hack-compatible-for-ipq4019-Lantiq-DSL.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/900-PCI-qcom-add-hack-compatible-for-ipq4019-Lantiq-DSL.patch
rename to target/linux/ipq40xx/patches-6.18/900-PCI-qcom-add-hack-compatible-for-ipq4019-Lantiq-DSL.patch
diff --git a/target/linux/ipq40xx/patches-6.12/910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch b/target/linux/ipq40xx/patches-6.18/910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch
rename to target/linux/ipq40xx/patches-6.18/910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch
diff --git a/target/linux/ipq40xx/patches-6.12/999-atm-mpoa-intel-dsl-phy-support.patch b/target/linux/ipq40xx/patches-6.18/999-atm-mpoa-intel-dsl-phy-support.patch
similarity index 100%
rename from target/linux/ipq40xx/patches-6.12/999-atm-mpoa-intel-dsl-phy-support.patch
rename to target/linux/ipq40xx/patches-6.18/999-atm-mpoa-intel-dsl-phy-support.patch