diff --git a/target/linux/sunxi/arm926ejs/config-6.12 b/target/linux/sunxi/arm926ejs/config-6.18
similarity index 100%
rename from target/linux/sunxi/arm926ejs/config-6.12
rename to target/linux/sunxi/arm926ejs/config-6.18
diff --git a/target/linux/sunxi/config-6.12 b/target/linux/sunxi/config-6.18
similarity index 100%
rename from target/linux/sunxi/config-6.12
rename to target/linux/sunxi/config-6.18
diff --git a/target/linux/sunxi/cortexa53/config-6.12 b/target/linux/sunxi/cortexa53/config-6.18
similarity index 100%
rename from target/linux/sunxi/cortexa53/config-6.12
rename to target/linux/sunxi/cortexa53/config-6.18
diff --git a/target/linux/sunxi/cortexa7/config-6.12 b/target/linux/sunxi/cortexa7/config-6.18
similarity index 100%
rename from target/linux/sunxi/cortexa7/config-6.12
rename to target/linux/sunxi/cortexa7/config-6.18
diff --git a/target/linux/sunxi/cortexa8/config-6.12 b/target/linux/sunxi/cortexa8/config-6.18
similarity index 100%
rename from target/linux/sunxi/cortexa8/config-6.12
rename to target/linux/sunxi/cortexa8/config-6.18
diff --git a/target/linux/sunxi/patches-6.12/102-sunxi-add-OF-node-for-USB-eth-on-NanoPi-R1S-H5.patch b/target/linux/sunxi/patches-6.18/102-sunxi-add-OF-node-for-USB-eth-on-NanoPi-R1S-H5.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/102-sunxi-add-OF-node-for-USB-eth-on-NanoPi-R1S-H5.patch
rename to target/linux/sunxi/patches-6.18/102-sunxi-add-OF-node-for-USB-eth-on-NanoPi-R1S-H5.patch
diff --git a/target/linux/sunxi/patches-6.12/301-orangepi_pc2_usb_otg_to_host_key_power.patch b/target/linux/sunxi/patches-6.18/301-orangepi_pc2_usb_otg_to_host_key_power.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/301-orangepi_pc2_usb_otg_to_host_key_power.patch
rename to target/linux/sunxi/patches-6.18/301-orangepi_pc2_usb_otg_to_host_key_power.patch
diff --git a/target/linux/sunxi/patches-6.12/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch b/target/linux/sunxi/patches-6.18/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch
rename to target/linux/sunxi/patches-6.18/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch
diff --git a/target/linux/sunxi/patches-6.12/410-sunxi-add-bananapi-p2-zero.patch b/target/linux/sunxi/patches-6.18/410-sunxi-add-bananapi-p2-zero.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/410-sunxi-add-bananapi-p2-zero.patch
rename to target/linux/sunxi/patches-6.18/410-sunxi-add-bananapi-p2-zero.patch
diff --git a/target/linux/sunxi/patches-6.12/430-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch b/target/linux/sunxi/patches-6.18/430-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/430-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch
rename to target/linux/sunxi/patches-6.18/430-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch
diff --git a/target/linux/sunxi/patches-6.12/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch b/target/linux/sunxi/patches-6.18/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch
rename to target/linux/sunxi/patches-6.18/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch
diff --git a/target/linux/sunxi/patches-6.12/442-arm64-dts-orangepi-one-plus-enable-PWM.patch b/target/linux/sunxi/patches-6.18/442-arm64-dts-orangepi-one-plus-enable-PWM.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/442-arm64-dts-orangepi-one-plus-enable-PWM.patch
rename to target/linux/sunxi/patches-6.18/442-arm64-dts-orangepi-one-plus-enable-PWM.patch
diff --git a/target/linux/sunxi/patches-6.12/450-arm64-dts-enable-wifi-on-pine64-boards.patch b/target/linux/sunxi/patches-6.18/450-arm64-dts-enable-wifi-on-pine64-boards.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/450-arm64-dts-enable-wifi-on-pine64-boards.patch
rename to target/linux/sunxi/patches-6.18/450-arm64-dts-enable-wifi-on-pine64-boards.patch
diff --git a/target/linux/sunxi/patches-6.12/451-sunxi-add-csi-video-support-for-nanopi-neo-air.patch b/target/linux/sunxi/patches-6.18/451-sunxi-add-csi-video-support-for-nanopi-neo-air.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/451-sunxi-add-csi-video-support-for-nanopi-neo-air.patch
rename to target/linux/sunxi/patches-6.18/451-sunxi-add-csi-video-support-for-nanopi-neo-air.patch
diff --git a/target/linux/sunxi/patches-6.12/460-f1c100s-sram-driver.patch b/target/linux/sunxi/patches-6.18/460-f1c100s-sram-driver.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/460-f1c100s-sram-driver.patch
rename to target/linux/sunxi/patches-6.18/460-f1c100s-sram-driver.patch
diff --git a/target/linux/sunxi/patches-6.12/461-f1c100s-watchdog-compat.patch b/target/linux/sunxi/patches-6.18/461-f1c100s-watchdog-compat.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.12/461-f1c100s-watchdog-compat.patch
rename to target/linux/sunxi/patches-6.18/461-f1c100s-watchdog-compat.patch