diff --git a/target/linux/generic/pending-5.4/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch b/target/linux/generic/pending-5.4/931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
similarity index 100%
rename from target/linux/generic/pending-5.4/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
rename to target/linux/generic/pending-5.4/931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
diff --git a/target/linux/ramips/patches-5.4/999-fix-hwnat.patch b/target/linux/generic/pending-5.4/999-backport-wireless-ethernet-dispatch.patch
similarity index 100%
rename from target/linux/ramips/patches-5.4/999-fix-hwnat.patch
rename to target/linux/generic/pending-5.4/999-backport-wireless-ethernet-dispatch.patch
diff --git a/target/linux/ramips/patches-5.15/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch b/target/linux/ramips/patches-5.15/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
index 68b31037f..76b9b36b0 100644
--- a/target/linux/ramips/patches-5.15/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
+++ b/target/linux/ramips/patches-5.15/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
@@ -55,7 +55,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 +};
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
-@@ -1854,6 +1854,7 @@ int spi_nor_sr2_bit7_quad_enable(struct
+@@ -1832,6 +1832,7 @@ int spi_nor_sr2_bit7_quad_enable(struct
  
  static const struct spi_nor_manufacturer *manufacturers[] = {
  	&spi_nor_atmel,