diff --git a/target/linux/mvebu/config-6.12 b/target/linux/mvebu/config-6.18
similarity index 100%
rename from target/linux/mvebu/config-6.12
rename to target/linux/mvebu/config-6.18
diff --git a/target/linux/mvebu/cortexa53/config-6.12 b/target/linux/mvebu/cortexa53/config-6.18
similarity index 100%
rename from target/linux/mvebu/cortexa53/config-6.12
rename to target/linux/mvebu/cortexa53/config-6.18
diff --git a/target/linux/mvebu/cortexa72/config-6.12 b/target/linux/mvebu/cortexa72/config-6.18
similarity index 100%
rename from target/linux/mvebu/cortexa72/config-6.12
rename to target/linux/mvebu/cortexa72/config-6.18
diff --git a/target/linux/mvebu/cortexa9/config-6.12 b/target/linux/mvebu/cortexa9/config-6.18
similarity index 100%
rename from target/linux/mvebu/cortexa9/config-6.12
rename to target/linux/mvebu/cortexa9/config-6.18
diff --git a/target/linux/mvebu/patches-6.12/0003-v6.16-pinctrl-armada-37xx-propagate-error-from-armada_37xx.patch b/target/linux/mvebu/patches-6.18/0003-v6.16-pinctrl-armada-37xx-propagate-error-from-armada_37xx.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/0003-v6.16-pinctrl-armada-37xx-propagate-error-from-armada_37xx.patch
rename to target/linux/mvebu/patches-6.18/0003-v6.16-pinctrl-armada-37xx-propagate-error-from-armada_37xx.patch
diff --git a/target/linux/mvebu/patches-6.12/100-aardvark-workaround-PCIe.patch b/target/linux/mvebu/patches-6.18/100-aardvark-workaround-PCIe.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/100-aardvark-workaround-PCIe.patch
rename to target/linux/mvebu/patches-6.18/100-aardvark-workaround-PCIe.patch
diff --git a/target/linux/mvebu/patches-6.12/105-power-reset-linkstation-poweroff-add-ls220de.patch b/target/linux/mvebu/patches-6.18/105-power-reset-linkstation-poweroff-add-ls220de.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/105-power-reset-linkstation-poweroff-add-ls220de.patch
rename to target/linux/mvebu/patches-6.18/105-power-reset-linkstation-poweroff-add-ls220de.patch
diff --git a/target/linux/mvebu/patches-6.12/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-6.18/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
rename to target/linux/mvebu/patches-6.18/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
diff --git a/target/linux/mvebu/patches-6.12/301-mvebu-armada-38x-enable-libata-leds.patch b/target/linux/mvebu/patches-6.18/301-mvebu-armada-38x-enable-libata-leds.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/301-mvebu-armada-38x-enable-libata-leds.patch
rename to target/linux/mvebu/patches-6.18/301-mvebu-armada-38x-enable-libata-leds.patch
diff --git a/target/linux/mvebu/patches-6.12/302-add_powertables.patch b/target/linux/mvebu/patches-6.18/302-add_powertables.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/302-add_powertables.patch
rename to target/linux/mvebu/patches-6.18/302-add_powertables.patch
diff --git a/target/linux/mvebu/patches-6.12/304-revert_i2c_delay.patch b/target/linux/mvebu/patches-6.18/304-revert_i2c_delay.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/304-revert_i2c_delay.patch
rename to target/linux/mvebu/patches-6.18/304-revert_i2c_delay.patch
diff --git a/target/linux/mvebu/patches-6.12/305-armada-385-rd-mtd-partitions.patch b/target/linux/mvebu/patches-6.18/305-armada-385-rd-mtd-partitions.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/305-armada-385-rd-mtd-partitions.patch
rename to target/linux/mvebu/patches-6.18/305-armada-385-rd-mtd-partitions.patch
diff --git a/target/linux/mvebu/patches-6.12/306-ARM-mvebu-385-ap-Add-partitions.patch b/target/linux/mvebu/patches-6.18/306-ARM-mvebu-385-ap-Add-partitions.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/306-ARM-mvebu-385-ap-Add-partitions.patch
rename to target/linux/mvebu/patches-6.18/306-ARM-mvebu-385-ap-Add-partitions.patch
diff --git a/target/linux/mvebu/patches-6.12/307-armada-xp-linksys-mamba-broken-idle.patch b/target/linux/mvebu/patches-6.18/307-armada-xp-linksys-mamba-broken-idle.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/307-armada-xp-linksys-mamba-broken-idle.patch
rename to target/linux/mvebu/patches-6.18/307-armada-xp-linksys-mamba-broken-idle.patch
diff --git a/target/linux/mvebu/patches-6.12/308-armada-xp-linksys-mamba-wan.patch b/target/linux/mvebu/patches-6.18/308-armada-xp-linksys-mamba-wan.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/308-armada-xp-linksys-mamba-wan.patch
rename to target/linux/mvebu/patches-6.18/308-armada-xp-linksys-mamba-wan.patch
diff --git a/target/linux/mvebu/patches-6.12/309-linksys-status-led.patch b/target/linux/mvebu/patches-6.18/309-linksys-status-led.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/309-linksys-status-led.patch
rename to target/linux/mvebu/patches-6.18/309-linksys-status-led.patch
diff --git a/target/linux/mvebu/patches-6.12/310-linksys-use-eth0-as-cpu-port.patch b/target/linux/mvebu/patches-6.18/310-linksys-use-eth0-as-cpu-port.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/310-linksys-use-eth0-as-cpu-port.patch
rename to target/linux/mvebu/patches-6.18/310-linksys-use-eth0-as-cpu-port.patch
diff --git a/target/linux/mvebu/patches-6.12/311-adjust-compatible-for-linksys.patch b/target/linux/mvebu/patches-6.18/311-adjust-compatible-for-linksys.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/311-adjust-compatible-for-linksys.patch
rename to target/linux/mvebu/patches-6.18/311-adjust-compatible-for-linksys.patch
diff --git a/target/linux/mvebu/patches-6.12/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch b/target/linux/mvebu/patches-6.18/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
rename to target/linux/mvebu/patches-6.18/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
diff --git a/target/linux/mvebu/patches-6.12/313-helios4-dts-status-led-alias.patch b/target/linux/mvebu/patches-6.18/313-helios4-dts-status-led-alias.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/313-helios4-dts-status-led-alias.patch
rename to target/linux/mvebu/patches-6.18/313-helios4-dts-status-led-alias.patch
diff --git a/target/linux/mvebu/patches-6.12/314-arm64-dts-marvell-enable-heartbeat-LED-by-default.patch b/target/linux/mvebu/patches-6.18/314-arm64-dts-marvell-enable-heartbeat-LED-by-default.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/314-arm64-dts-marvell-enable-heartbeat-LED-by-default.patch
rename to target/linux/mvebu/patches-6.18/314-arm64-dts-marvell-enable-heartbeat-LED-by-default.patch
diff --git a/target/linux/mvebu/patches-6.12/315-armada-xp-linksys-mamba-resize-kernel.patch b/target/linux/mvebu/patches-6.18/315-armada-xp-linksys-mamba-resize-kernel.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/315-armada-xp-linksys-mamba-resize-kernel.patch
rename to target/linux/mvebu/patches-6.18/315-armada-xp-linksys-mamba-resize-kernel.patch
diff --git a/target/linux/mvebu/patches-6.12/316-armada-370-dts-fix-crypto-engine.patch b/target/linux/mvebu/patches-6.18/316-armada-370-dts-fix-crypto-engine.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/316-armada-370-dts-fix-crypto-engine.patch
rename to target/linux/mvebu/patches-6.18/316-armada-370-dts-fix-crypto-engine.patch
diff --git a/target/linux/mvebu/patches-6.12/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch b/target/linux/mvebu/patches-6.18/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch
rename to target/linux/mvebu/patches-6.18/320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch
diff --git a/target/linux/mvebu/patches-6.12/321-arm64-dts-marvell-reorder-ethernet-aliases-for-ESPRE.patch b/target/linux/mvebu/patches-6.18/321-arm64-dts-marvell-reorder-ethernet-aliases-for-ESPRE.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/321-arm64-dts-marvell-reorder-ethernet-aliases-for-ESPRE.patch
rename to target/linux/mvebu/patches-6.18/321-arm64-dts-marvell-reorder-ethernet-aliases-for-ESPRE.patch
diff --git a/target/linux/mvebu/patches-6.12/322-arm64-dts-marvell-specity-phy-mode-2500base-x-for-Me.patch b/target/linux/mvebu/patches-6.18/322-arm64-dts-marvell-specity-phy-mode-2500base-x-for-Me.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/322-arm64-dts-marvell-specity-phy-mode-2500base-x-for-Me.patch
rename to target/linux/mvebu/patches-6.18/322-arm64-dts-marvell-specity-phy-mode-2500base-x-for-Me.patch
diff --git a/target/linux/mvebu/patches-6.12/323-arm64-dts-marvell-update-LED-and-partition-labels-fo.patch b/target/linux/mvebu/patches-6.18/323-arm64-dts-marvell-update-LED-and-partition-labels-fo.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/323-arm64-dts-marvell-update-LED-and-partition-labels-fo.patch
rename to target/linux/mvebu/patches-6.18/323-arm64-dts-marvell-update-LED-and-partition-labels-fo.patch
diff --git a/target/linux/mvebu/patches-6.12/324-arm64-dts-marvell-use-u-boot-part-label-for-Globalsc.patch b/target/linux/mvebu/patches-6.18/324-arm64-dts-marvell-use-u-boot-part-label-for-Globalsc.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/324-arm64-dts-marvell-use-u-boot-part-label-for-Globalsc.patch
rename to target/linux/mvebu/patches-6.18/324-arm64-dts-marvell-use-u-boot-part-label-for-Globalsc.patch
diff --git a/target/linux/mvebu/patches-6.12/325-arm-dts-marvell-add-LED-aliases-and-USB-ports-to-Cte.patch b/target/linux/mvebu/patches-6.18/325-arm-dts-marvell-add-LED-aliases-and-USB-ports-to-Cte.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/325-arm-dts-marvell-add-LED-aliases-and-USB-ports-to-Cte.patch
rename to target/linux/mvebu/patches-6.18/325-arm-dts-marvell-add-LED-aliases-and-USB-ports-to-Cte.patch
diff --git a/target/linux/mvebu/patches-6.12/326-arm64-dts-marvell-glinet-mv1000-fix-sdhci1.patch b/target/linux/mvebu/patches-6.18/326-arm64-dts-marvell-glinet-mv1000-fix-sdhci1.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/326-arm64-dts-marvell-glinet-mv1000-fix-sdhci1.patch
rename to target/linux/mvebu/patches-6.18/326-arm64-dts-marvell-glinet-mv1000-fix-sdhci1.patch
diff --git a/target/linux/mvebu/patches-6.12/350-drivers-thermal-step_wise-add-support-for-hysteresis.patch b/target/linux/mvebu/patches-6.18/350-drivers-thermal-step_wise-add-support-for-hysteresis.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/350-drivers-thermal-step_wise-add-support-for-hysteresis.patch
rename to target/linux/mvebu/patches-6.18/350-drivers-thermal-step_wise-add-support-for-hysteresis.patch
diff --git a/target/linux/mvebu/patches-6.12/400-find_active_root.patch b/target/linux/mvebu/patches-6.18/400-find_active_root.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/400-find_active_root.patch
rename to target/linux/mvebu/patches-6.18/400-find_active_root.patch
diff --git a/target/linux/mvebu/patches-6.12/700-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-6.18/700-mvneta-tx-queue-workaround.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/700-mvneta-tx-queue-workaround.patch
rename to target/linux/mvebu/patches-6.18/700-mvneta-tx-queue-workaround.patch
diff --git a/target/linux/mvebu/patches-6.12/800-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch b/target/linux/mvebu/patches-6.18/800-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/800-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch
rename to target/linux/mvebu/patches-6.18/800-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch
diff --git a/target/linux/mvebu/patches-6.12/801-pci-mvebu-time-out-reset-on-link-up.patch b/target/linux/mvebu/patches-6.18/801-pci-mvebu-time-out-reset-on-link-up.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/801-pci-mvebu-time-out-reset-on-link-up.patch
rename to target/linux/mvebu/patches-6.18/801-pci-mvebu-time-out-reset-on-link-up.patch
diff --git a/target/linux/mvebu/patches-6.12/830-01-i2c-add-init_recovery-callback.patch b/target/linux/mvebu/patches-6.18/830-01-i2c-add-init_recovery-callback.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/830-01-i2c-add-init_recovery-callback.patch
rename to target/linux/mvebu/patches-6.18/830-01-i2c-add-init_recovery-callback.patch
diff --git a/target/linux/mvebu/patches-6.12/830-02-i2c-pxa-prevent-calling-of-the-generic-recovery-init-code.patch b/target/linux/mvebu/patches-6.18/830-02-i2c-pxa-prevent-calling-of-the-generic-recovery-init-code.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/830-02-i2c-pxa-prevent-calling-of-the-generic-recovery-init-code.patch
rename to target/linux/mvebu/patches-6.18/830-02-i2c-pxa-prevent-calling-of-the-generic-recovery-init-code.patch
diff --git a/target/linux/mvebu/patches-6.12/830-03-i2c-pxa-handle-Early-Bus-Busy-condition-on-Armada-3700.patch b/target/linux/mvebu/patches-6.18/830-03-i2c-pxa-handle-Early-Bus-Busy-condition-on-Armada-3700.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/830-03-i2c-pxa-handle-Early-Bus-Busy-condition-on-Armada-3700.patch
rename to target/linux/mvebu/patches-6.18/830-03-i2c-pxa-handle-Early-Bus-Busy-condition-on-Armada-3700.patch
diff --git a/target/linux/mvebu/patches-6.12/901-dt-bindings-Add-IEI-vendor-prefix-and-IEI-WT61P803-P.patch b/target/linux/mvebu/patches-6.18/901-dt-bindings-Add-IEI-vendor-prefix-and-IEI-WT61P803-P.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/901-dt-bindings-Add-IEI-vendor-prefix-and-IEI-WT61P803-P.patch
rename to target/linux/mvebu/patches-6.18/901-dt-bindings-Add-IEI-vendor-prefix-and-IEI-WT61P803-P.patch
diff --git a/target/linux/mvebu/patches-6.12/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch b/target/linux/mvebu/patches-6.18/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch
rename to target/linux/mvebu/patches-6.18/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch
diff --git a/target/linux/mvebu/patches-6.12/903-drivers-hwmon-Add-the-IEI-WT61P803-PUZZLE-HWMON-driv.patch b/target/linux/mvebu/patches-6.18/903-drivers-hwmon-Add-the-IEI-WT61P803-PUZZLE-HWMON-driv.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/903-drivers-hwmon-Add-the-IEI-WT61P803-PUZZLE-HWMON-driv.patch
rename to target/linux/mvebu/patches-6.18/903-drivers-hwmon-Add-the-IEI-WT61P803-PUZZLE-HWMON-driv.patch
diff --git a/target/linux/mvebu/patches-6.12/904-drivers-leds-Add-the-IEI-WT61P803-PUZZLE-LED-driver.patch b/target/linux/mvebu/patches-6.18/904-drivers-leds-Add-the-IEI-WT61P803-PUZZLE-LED-driver.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/904-drivers-leds-Add-the-IEI-WT61P803-PUZZLE-LED-driver.patch
rename to target/linux/mvebu/patches-6.18/904-drivers-leds-Add-the-IEI-WT61P803-PUZZLE-LED-driver.patch
diff --git a/target/linux/mvebu/patches-6.12/905-Documentation-ABI-Add-iei-wt61p803-puzzle-driver-sys.patch b/target/linux/mvebu/patches-6.18/905-Documentation-ABI-Add-iei-wt61p803-puzzle-driver-sys.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/905-Documentation-ABI-Add-iei-wt61p803-puzzle-driver-sys.patch
rename to target/linux/mvebu/patches-6.18/905-Documentation-ABI-Add-iei-wt61p803-puzzle-driver-sys.patch
diff --git a/target/linux/mvebu/patches-6.12/906-Documentation-hwmon-Add-iei-wt61p803-puzzle-hwmon-dr.patch b/target/linux/mvebu/patches-6.18/906-Documentation-hwmon-Add-iei-wt61p803-puzzle-hwmon-dr.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/906-Documentation-hwmon-Add-iei-wt61p803-puzzle-hwmon-dr.patch
rename to target/linux/mvebu/patches-6.18/906-Documentation-hwmon-Add-iei-wt61p803-puzzle-hwmon-dr.patch
diff --git a/target/linux/mvebu/patches-6.12/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch b/target/linux/mvebu/patches-6.18/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch
rename to target/linux/mvebu/patches-6.18/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch
diff --git a/target/linux/mvebu/patches-6.12/910-drivers-leds-wt61p803-puzzle-improvements.patch b/target/linux/mvebu/patches-6.18/910-drivers-leds-wt61p803-puzzle-improvements.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/910-drivers-leds-wt61p803-puzzle-improvements.patch
rename to target/linux/mvebu/patches-6.18/910-drivers-leds-wt61p803-puzzle-improvements.patch
diff --git a/target/linux/mvebu/patches-6.12/911-drivers-leds-wt61p803-puzzle-mcu-retry.patch b/target/linux/mvebu/patches-6.18/911-drivers-leds-wt61p803-puzzle-mcu-retry.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/911-drivers-leds-wt61p803-puzzle-mcu-retry.patch
rename to target/linux/mvebu/patches-6.18/911-drivers-leds-wt61p803-puzzle-mcu-retry.patch
diff --git a/target/linux/mvebu/patches-6.12/912-drivers-hwmon-wt61p803-puzzle-thermal-zone.patch b/target/linux/mvebu/patches-6.18/912-drivers-hwmon-wt61p803-puzzle-thermal-zone.patch
similarity index 100%
rename from target/linux/mvebu/patches-6.12/912-drivers-hwmon-wt61p803-puzzle-thermal-zone.patch
rename to target/linux/mvebu/patches-6.18/912-drivers-hwmon-wt61p803-puzzle-thermal-zone.patch