diff --git a/target/linux/generic/pending-4.14/142-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch b/target/linux/generic/backport-4.14/043-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
similarity index 88%
rename from target/linux/generic/pending-4.14/142-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
rename to target/linux/generic/backport-4.14/043-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
index 60c8ecbdc596d1fddaa25ebd47b1813c1ee911aa..e08f8dad32e411cdd21fd771fd5182d5fdb5bbe9 100644
--- a/target/linux/generic/pending-4.14/142-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
+++ b/target/linux/generic/backport-4.14/043-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
@@ -1,4 +1,6 @@
+From 237ea0d4762cc14d0fc80e80d61f0f08e1050c7f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 12 Apr 2018 07:24:52 +0200
 Subject: [PATCH] mtd: bcm47xxpart: improve handling TRX partition size
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -6,7 +8,7 @@ Content-Transfer-Encoding: 8bit
 
 When bcm47xxpart finds a TRX partition (container) it's supposed to jump
 to the end of it and keep looking for more partitions. TRX and its
-subpartitions are handled be a separated parser.
+subpartitions are handled by a separate parser.
 
 The problem with old code was relying on the length specified in a TRX
 header. That isn't reliable as TRX is commonly modified to have checksum
@@ -22,7 +24,10 @@ This makes code more optimal & reliable thanks to skipping data that
 shouldn't be parsed.
 
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
 ---
+ drivers/mtd/bcm47xxpart.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
 
 --- a/drivers/mtd/bcm47xxpart.c
 +++ b/drivers/mtd/bcm47xxpart.c
diff --git a/target/linux/generic/pending-4.9/142-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch b/target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
similarity index 88%
rename from target/linux/generic/pending-4.9/142-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
rename to target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
index 60c8ecbdc596d1fddaa25ebd47b1813c1ee911aa..e08f8dad32e411cdd21fd771fd5182d5fdb5bbe9 100644
--- a/target/linux/generic/pending-4.9/142-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
+++ b/target/linux/generic/backport-4.9/069-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
@@ -1,4 +1,6 @@
+From 237ea0d4762cc14d0fc80e80d61f0f08e1050c7f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 12 Apr 2018 07:24:52 +0200
 Subject: [PATCH] mtd: bcm47xxpart: improve handling TRX partition size
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -6,7 +8,7 @@ Content-Transfer-Encoding: 8bit
 
 When bcm47xxpart finds a TRX partition (container) it's supposed to jump
 to the end of it and keep looking for more partitions. TRX and its
-subpartitions are handled be a separated parser.
+subpartitions are handled by a separate parser.
 
 The problem with old code was relying on the length specified in a TRX
 header. That isn't reliable as TRX is commonly modified to have checksum
@@ -22,7 +24,10 @@ This makes code more optimal & reliable thanks to skipping data that
 shouldn't be parsed.
 
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
 ---
+ drivers/mtd/bcm47xxpart.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
 
 --- a/drivers/mtd/bcm47xxpart.c
 +++ b/drivers/mtd/bcm47xxpart.c
diff --git a/target/linux/generic/pending-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch b/target/linux/generic/pending-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
similarity index 88%
rename from target/linux/generic/pending-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
rename to target/linux/generic/pending-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
index 31acebf50fb566f77c5257118706f1c3d4e49bf8..eb3f9bdfc8243be8b5f003467adfdc458d6cbc3d 100644
--- a/target/linux/generic/pending-4.4/141-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
+++ b/target/linux/generic/pending-4.4/042-v4.18-0009-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
@@ -1,4 +1,6 @@
+From 237ea0d4762cc14d0fc80e80d61f0f08e1050c7f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 12 Apr 2018 07:24:52 +0200
 Subject: [PATCH] mtd: bcm47xxpart: improve handling TRX partition size
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -6,7 +8,7 @@ Content-Transfer-Encoding: 8bit
 
 When bcm47xxpart finds a TRX partition (container) it's supposed to jump
 to the end of it and keep looking for more partitions. TRX and its
-subpartitions are handled be a separated parser.
+subpartitions are handled by a separate parser.
 
 The problem with old code was relying on the length specified in a TRX
 header. That isn't reliable as TRX is commonly modified to have checksum
@@ -22,7 +24,10 @@ This makes code more optimal & reliable thanks to skipping data that
 shouldn't be parsed.
 
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
 ---
+ drivers/mtd/bcm47xxpart.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
 
 --- a/drivers/mtd/bcm47xxpart.c
 +++ b/drivers/mtd/bcm47xxpart.c