aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-05-11 00:06:02 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-05-11 01:05:38 +0100
commite7249669d2af8f588a4e3beec589c4cbe5bd2fec (patch)
tree3bd9b1fcd7335a87ed45dd8f51a104feb5dc04f1
parente57e460dc75836d3227e7370b9e64a0eabc9d91d (diff)
downloadupstream-e7249669d2af8f588a4e3beec589c4cbe5bd2fec.tar.gz
upstream-e7249669d2af8f588a4e3beec589c4cbe5bd2fec.tar.bz2
upstream-e7249669d2af8f588a4e3beec589c4cbe5bd2fec.zip
kernel: move three accepted patches from pending to backports
311-MIPS-zboot-put-appended-dtb-into-a-section.patch commit d2e850e96183 in kernel, part of v5.11 499-mtd-don-t-lock-when-recursively-deleting-partitions.patch commit cb4543054c5c in kernel, part of v5.13 103-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch commit 5a4fa44f5e1b in kernel, part of v5.13 Move them to backports folder to make maintainance easier. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--target/linux/generic/backport-5.10/103-v5.13-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch (renamed from target/linux/generic/pending-5.10/103-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch)0
-rw-r--r--target/linux/generic/backport-5.10/311-v5.11-MIPS-zboot-put-appended-dtb-into-a-section.patch (renamed from target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch)0
-rw-r--r--target/linux/generic/backport-5.10/499-v5.13-mtd-don-t-lock-when-recursively-deleting-partitions.patch (renamed from target/linux/generic/pending-5.10/499-mtd-don-t-lock-when-recursively-deleting-partitions.patch)2
3 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.10/103-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch b/target/linux/generic/backport-5.10/103-v5.13-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch
index cf79e9a449..cf79e9a449 100644
--- a/target/linux/generic/pending-5.10/103-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch
+++ b/target/linux/generic/backport-5.10/103-v5.13-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch
diff --git a/target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch b/target/linux/generic/backport-5.10/311-v5.11-MIPS-zboot-put-appended-dtb-into-a-section.patch
index 3f8808f702..3f8808f702 100644
--- a/target/linux/generic/pending-5.10/311-MIPS-zboot-put-appended-dtb-into-a-section.patch
+++ b/target/linux/generic/backport-5.10/311-v5.11-MIPS-zboot-put-appended-dtb-into-a-section.patch
diff --git a/target/linux/generic/pending-5.10/499-mtd-don-t-lock-when-recursively-deleting-partitions.patch b/target/linux/generic/backport-5.10/499-v5.13-mtd-don-t-lock-when-recursively-deleting-partitions.patch
index 505131b684..d34248fbc7 100644
--- a/target/linux/generic/pending-5.10/499-mtd-don-t-lock-when-recursively-deleting-partitions.patch
+++ b/target/linux/generic/backport-5.10/499-v5.13-mtd-don-t-lock-when-recursively-deleting-partitions.patch
@@ -13,7 +13,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -474,7 +474,7 @@ static int __del_mtd_partitions(struct m
+@@ -331,7 +331,7 @@ static int __del_mtd_partitions(struct m
list_for_each_entry_safe(child, next, &mtd->partitions, part.node) {
if (mtd_has_partitions(child))