diff --git a/target/linux/siflower/files-6.12/arch/mips/include/asm/mach-siflower/kmalloc.h b/target/linux/siflower/files-6.18/arch/mips/include/asm/mach-siflower/kmalloc.h
similarity index 100%
rename from target/linux/siflower/files-6.12/arch/mips/include/asm/mach-siflower/kmalloc.h
rename to target/linux/siflower/files-6.18/arch/mips/include/asm/mach-siflower/kmalloc.h
diff --git a/target/linux/siflower/files-6.12/drivers/clk/siflower/Kconfig b/target/linux/siflower/files-6.18/drivers/clk/siflower/Kconfig
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/clk/siflower/Kconfig
rename to target/linux/siflower/files-6.18/drivers/clk/siflower/Kconfig
diff --git a/target/linux/siflower/files-6.12/drivers/clk/siflower/Makefile b/target/linux/siflower/files-6.18/drivers/clk/siflower/Makefile
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/clk/siflower/Makefile
rename to target/linux/siflower/files-6.18/drivers/clk/siflower/Makefile
diff --git a/target/linux/siflower/files-6.12/drivers/clk/siflower/clk-sf19a2890-periph.c b/target/linux/siflower/files-6.18/drivers/clk/siflower/clk-sf19a2890-periph.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/clk/siflower/clk-sf19a2890-periph.c
rename to target/linux/siflower/files-6.18/drivers/clk/siflower/clk-sf19a2890-periph.c
diff --git a/target/linux/siflower/files-6.12/drivers/clk/siflower/clk-sf19a2890.c b/target/linux/siflower/files-6.18/drivers/clk/siflower/clk-sf19a2890.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/clk/siflower/clk-sf19a2890.c
rename to target/linux/siflower/files-6.18/drivers/clk/siflower/clk-sf19a2890.c
diff --git a/target/linux/siflower/files-6.12/drivers/clk/siflower/clk-sf21-topcrm.c b/target/linux/siflower/files-6.18/drivers/clk/siflower/clk-sf21-topcrm.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/clk/siflower/clk-sf21-topcrm.c
rename to target/linux/siflower/files-6.18/drivers/clk/siflower/clk-sf21-topcrm.c
diff --git a/target/linux/siflower/files-6.12/drivers/gpio/gpio-siflower.c b/target/linux/siflower/files-6.18/drivers/gpio/gpio-siflower.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/gpio/gpio-siflower.c
rename to target/linux/siflower/files-6.18/drivers/gpio/gpio-siflower.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/Kconfig b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/Kconfig
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/Kconfig
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/Kconfig
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/Makefile b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/Makefile
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/Makefile
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/Makefile
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/dma.h b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/dma.h
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/dma.h
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/dma.h
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/dpns.h b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/dpns.h
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/dpns.h
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/dpns.h
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/eth.h b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/eth.h
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/eth.h
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/eth.h
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_debugfs.c b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_debugfs.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_debugfs.c
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_debugfs.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_se.c b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_se.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_se.c
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_se.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_se.h b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_se.h
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_se.h
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_se.h
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_tmu.c b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_tmu.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_tmu.c
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_tmu.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_tmu.h b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_tmu.h
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns_tmu.h
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sf_dpns_tmu.h
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxgmac-dma.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxgmac-dma.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-ext.h b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxgmac-ext.h
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-ext.h
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxgmac-ext.h
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxgmac.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxgmac.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxpcs.c b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxpcs.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxpcs.c
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxpcs.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxpcs.h b/target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxpcs.h
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxpcs.h
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/siflower/sfxpcs.h
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c b/target/linux/siflower/files-6.18/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
rename to target/linux/siflower/files-6.18/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
diff --git a/target/linux/siflower/files-6.12/drivers/net/phy/siflower.c b/target/linux/siflower/files-6.18/drivers/net/phy/siflower.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/net/phy/siflower.c
rename to target/linux/siflower/files-6.18/drivers/net/phy/siflower.c
diff --git a/target/linux/siflower/files-6.12/drivers/pci/controller/dwc/pcie-sf21.c b/target/linux/siflower/files-6.18/drivers/pci/controller/dwc/pcie-sf21.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/pci/controller/dwc/pcie-sf21.c
rename to target/linux/siflower/files-6.18/drivers/pci/controller/dwc/pcie-sf21.c
diff --git a/target/linux/siflower/files-6.12/drivers/phy/siflower/Kconfig b/target/linux/siflower/files-6.18/drivers/phy/siflower/Kconfig
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/phy/siflower/Kconfig
rename to target/linux/siflower/files-6.18/drivers/phy/siflower/Kconfig
diff --git a/target/linux/siflower/files-6.12/drivers/phy/siflower/Makefile b/target/linux/siflower/files-6.18/drivers/phy/siflower/Makefile
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/phy/siflower/Makefile
rename to target/linux/siflower/files-6.18/drivers/phy/siflower/Makefile
diff --git a/target/linux/siflower/files-6.12/drivers/phy/siflower/phy-sf19a2890-usb.c b/target/linux/siflower/files-6.18/drivers/phy/siflower/phy-sf19a2890-usb.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/phy/siflower/phy-sf19a2890-usb.c
rename to target/linux/siflower/files-6.18/drivers/phy/siflower/phy-sf19a2890-usb.c
diff --git a/target/linux/siflower/files-6.12/drivers/phy/siflower/phy-sf21-pcie.c b/target/linux/siflower/files-6.18/drivers/phy/siflower/phy-sf21-pcie.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/phy/siflower/phy-sf21-pcie.c
rename to target/linux/siflower/files-6.18/drivers/phy/siflower/phy-sf21-pcie.c
diff --git a/target/linux/siflower/files-6.12/drivers/phy/siflower/phy-sf21-usb.c b/target/linux/siflower/files-6.18/drivers/phy/siflower/phy-sf21-usb.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/phy/siflower/phy-sf21-usb.c
rename to target/linux/siflower/files-6.18/drivers/phy/siflower/phy-sf21-usb.c
diff --git a/target/linux/siflower/files-6.12/drivers/pinctrl/pinctrl-sf19a2890.c b/target/linux/siflower/files-6.18/drivers/pinctrl/pinctrl-sf19a2890.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/pinctrl/pinctrl-sf19a2890.c
rename to target/linux/siflower/files-6.18/drivers/pinctrl/pinctrl-sf19a2890.c
diff --git a/target/linux/siflower/files-6.12/drivers/reset/reset-sf19a2890-periph.c b/target/linux/siflower/files-6.18/drivers/reset/reset-sf19a2890-periph.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/reset/reset-sf19a2890-periph.c
rename to target/linux/siflower/files-6.18/drivers/reset/reset-sf19a2890-periph.c
diff --git a/target/linux/siflower/files-6.12/drivers/reset/reset-sf21.c b/target/linux/siflower/files-6.18/drivers/reset/reset-sf21.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/reset/reset-sf21.c
rename to target/linux/siflower/files-6.18/drivers/reset/reset-sf21.c
diff --git a/target/linux/siflower/files-6.12/drivers/spi/spi-sf21-qspi.c b/target/linux/siflower/files-6.18/drivers/spi/spi-sf21-qspi.c
similarity index 100%
rename from target/linux/siflower/files-6.12/drivers/spi/spi-sf21-qspi.c
rename to target/linux/siflower/files-6.18/drivers/spi/spi-sf21-qspi.c
diff --git a/target/linux/siflower/files-6.12/include/dt-bindings/clock/siflower,sf19a2890-clk.h b/target/linux/siflower/files-6.18/include/dt-bindings/clock/siflower,sf19a2890-clk.h
similarity index 100%
rename from target/linux/siflower/files-6.12/include/dt-bindings/clock/siflower,sf19a2890-clk.h
rename to target/linux/siflower/files-6.18/include/dt-bindings/clock/siflower,sf19a2890-clk.h
diff --git a/target/linux/siflower/files-6.12/include/dt-bindings/clock/siflower,sf21-topcrm.h b/target/linux/siflower/files-6.18/include/dt-bindings/clock/siflower,sf21-topcrm.h
similarity index 100%
rename from target/linux/siflower/files-6.12/include/dt-bindings/clock/siflower,sf21-topcrm.h
rename to target/linux/siflower/files-6.18/include/dt-bindings/clock/siflower,sf21-topcrm.h
diff --git a/target/linux/siflower/files-6.12/include/dt-bindings/pinctrl/siflower,sf21-iomux.h b/target/linux/siflower/files-6.18/include/dt-bindings/pinctrl/siflower,sf21-iomux.h
similarity index 100%
rename from target/linux/siflower/files-6.12/include/dt-bindings/pinctrl/siflower,sf21-iomux.h
rename to target/linux/siflower/files-6.18/include/dt-bindings/pinctrl/siflower,sf21-iomux.h
diff --git a/target/linux/siflower/files-6.12/include/dt-bindings/reset/siflower,sf21-reset.h b/target/linux/siflower/files-6.18/include/dt-bindings/reset/siflower,sf21-reset.h
similarity index 100%
rename from target/linux/siflower/files-6.12/include/dt-bindings/reset/siflower,sf21-reset.h
rename to target/linux/siflower/files-6.18/include/dt-bindings/reset/siflower,sf21-reset.h
diff --git a/target/linux/siflower/patches-6.12/004-mips-add-support-for-Siflower-SF19A2890.patch b/target/linux/siflower/patches-6.18/004-mips-add-support-for-Siflower-SF19A2890.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/004-mips-add-support-for-Siflower-SF19A2890.patch
rename to target/linux/siflower/patches-6.18/004-mips-add-support-for-Siflower-SF19A2890.patch
diff --git a/target/linux/siflower/patches-6.12/005-clk-add-drivers-for-siflower-socs.patch b/target/linux/siflower/patches-6.18/005-clk-add-drivers-for-siflower-socs.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/005-clk-add-drivers-for-siflower-socs.patch
rename to target/linux/siflower/patches-6.18/005-clk-add-drivers-for-siflower-socs.patch
diff --git a/target/linux/siflower/patches-6.12/006-reset-add-support-for-sf19a2890.patch b/target/linux/siflower/patches-6.18/006-reset-add-support-for-sf19a2890.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/006-reset-add-support-for-sf19a2890.patch
rename to target/linux/siflower/patches-6.18/006-reset-add-support-for-sf19a2890.patch
diff --git a/target/linux/siflower/patches-6.12/007-gpio-add-support-for-siflower-socs.patch b/target/linux/siflower/patches-6.18/007-gpio-add-support-for-siflower-socs.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/007-gpio-add-support-for-siflower-socs.patch
rename to target/linux/siflower/patches-6.18/007-gpio-add-support-for-siflower-socs.patch
diff --git a/target/linux/siflower/patches-6.12/008-pinctrl-add-driver-for-siflower-sf19a2890.patch b/target/linux/siflower/patches-6.18/008-pinctrl-add-driver-for-siflower-sf19a2890.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/008-pinctrl-add-driver-for-siflower-sf19a2890.patch
rename to target/linux/siflower/patches-6.18/008-pinctrl-add-driver-for-siflower-sf19a2890.patch
diff --git a/target/linux/siflower/patches-6.12/009-stmmac-add-support-for-sf19a2890.patch b/target/linux/siflower/patches-6.18/009-stmmac-add-support-for-sf19a2890.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/009-stmmac-add-support-for-sf19a2890.patch
rename to target/linux/siflower/patches-6.18/009-stmmac-add-support-for-sf19a2890.patch
diff --git a/target/linux/siflower/patches-6.12/010-phy-add-support-for-Siflower-USB-PHYs.patch b/target/linux/siflower/patches-6.18/010-phy-add-support-for-Siflower-USB-PHYs.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/010-phy-add-support-for-Siflower-USB-PHYs.patch
rename to target/linux/siflower/patches-6.18/010-phy-add-support-for-Siflower-USB-PHYs.patch
diff --git a/target/linux/siflower/patches-6.12/011-usb-dwc2-add-support-for-Siflower-SF19A2890.patch b/target/linux/siflower/patches-6.18/011-usb-dwc2-add-support-for-Siflower-SF19A2890.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/011-usb-dwc2-add-support-for-Siflower-SF19A2890.patch
rename to target/linux/siflower/patches-6.18/011-usb-dwc2-add-support-for-Siflower-SF19A2890.patch
diff --git a/target/linux/siflower/patches-6.12/012-usb-dwc2-handle-OTG-interrupt-regardless-of-GINTSTS.patch b/target/linux/siflower/patches-6.18/012-usb-dwc2-handle-OTG-interrupt-regardless-of-GINTSTS.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/012-usb-dwc2-handle-OTG-interrupt-regardless-of-GINTSTS.patch
rename to target/linux/siflower/patches-6.18/012-usb-dwc2-handle-OTG-interrupt-regardless-of-GINTSTS.patch
diff --git a/target/linux/siflower/patches-6.12/013-riscv-add-Siflower-RISC-V-SoC-family-Kconfig-support.patch b/target/linux/siflower/patches-6.18/013-riscv-add-Siflower-RISC-V-SoC-family-Kconfig-support.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/013-riscv-add-Siflower-RISC-V-SoC-family-Kconfig-support.patch
rename to target/linux/siflower/patches-6.18/013-riscv-add-Siflower-RISC-V-SoC-family-Kconfig-support.patch
diff --git a/target/linux/siflower/patches-6.12/015-reset-add-support-for-sf21a6826-sf21h8898.patch b/target/linux/siflower/patches-6.18/015-reset-add-support-for-sf21a6826-sf21h8898.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/015-reset-add-support-for-sf21a6826-sf21h8898.patch
rename to target/linux/siflower/patches-6.18/015-reset-add-support-for-sf21a6826-sf21h8898.patch
diff --git a/target/linux/siflower/patches-6.12/016-spi-spi-mem-allow-gpio-cs-in-spi_mem_exec_op.patch b/target/linux/siflower/patches-6.18/016-spi-spi-mem-allow-gpio-cs-in-spi_mem_exec_op.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/016-spi-spi-mem-allow-gpio-cs-in-spi_mem_exec_op.patch
rename to target/linux/siflower/patches-6.18/016-spi-spi-mem-allow-gpio-cs-in-spi_mem_exec_op.patch
diff --git a/target/linux/siflower/patches-6.12/017-spi-add-support-for-sf21-qspi.patch b/target/linux/siflower/patches-6.18/017-spi-add-support-for-sf21-qspi.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/017-spi-add-support-for-sf21-qspi.patch
rename to target/linux/siflower/patches-6.18/017-spi-add-support-for-sf21-qspi.patch
diff --git a/target/linux/siflower/patches-6.12/018-pci-dw-pcie-add-support-for-sf21-pcie.patch b/target/linux/siflower/patches-6.18/018-pci-dw-pcie-add-support-for-sf21-pcie.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/018-pci-dw-pcie-add-support-for-sf21-pcie.patch
rename to target/linux/siflower/patches-6.18/018-pci-dw-pcie-add-support-for-sf21-pcie.patch
diff --git a/target/linux/siflower/patches-6.12/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch b/target/linux/siflower/patches-6.18/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
rename to target/linux/siflower/patches-6.18/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
diff --git a/target/linux/siflower/patches-6.12/020-net-ethernet-add-support-for-Siflower-DPNS.patch b/target/linux/siflower/patches-6.18/020-net-ethernet-add-support-for-Siflower-DPNS.patch
similarity index 100%
rename from target/linux/siflower/patches-6.12/020-net-ethernet-add-support-for-Siflower-DPNS.patch
rename to target/linux/siflower/patches-6.18/020-net-ethernet-add-support-for-Siflower-DPNS.patch
diff --git a/target/linux/siflower/sf19a2890/config-6.12 b/target/linux/siflower/sf19a2890/config-6.18
similarity index 100%
rename from target/linux/siflower/sf19a2890/config-6.12
rename to target/linux/siflower/sf19a2890/config-6.18
diff --git a/target/linux/siflower/sf21/config-6.12 b/target/linux/siflower/sf21/config-6.18
similarity index 100%
rename from target/linux/siflower/sf21/config-6.12
rename to target/linux/siflower/sf21/config-6.18