From e7249669d2af8f588a4e3beec589c4cbe5bd2fec Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 11 May 2021 00:06:02 +0100 Subject: 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 --- ...lock-when-recursively-deleting-partitions.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 target/linux/generic/backport-5.10/499-v5.13-mtd-don-t-lock-when-recursively-deleting-partitions.patch (limited to 'target/linux/generic/backport-5.10/499-v5.13-mtd-don-t-lock-when-recursively-deleting-partitions.patch') diff --git a/target/linux/generic/backport-5.10/499-v5.13-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 new file mode 100644 index 0000000000..d34248fbc7 --- /dev/null +++ b/target/linux/generic/backport-5.10/499-v5.13-mtd-don-t-lock-when-recursively-deleting-partitions.patch @@ -0,0 +1,24 @@ +From: David Bauer +Date: Wed, 17 Feb 2021 03:21:39 +0100 +Subject: [PATCH] mtd: don't lock when recursively deleting partitions + +When recursively deleting partitions, don't acquire the masters +partition lock twice. Otherwise the process endy up in a deadlocked +state. + +Signed-off-by: David Bauer +--- + drivers/mtd/mtdpart.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -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)) +- del_mtd_partitions(child); ++ __del_mtd_partitions(child); + + pr_info("Deleting %s MTD partition\n", child->name); + ret = del_mtd_device(child); -- cgit v1.2.3