ipq806x: 5:15: copy config and patch from 5.10

[openwrt/staging/chunkeey.git] / target / linux / ipq806x / patches-5.15 / 102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch

diff --git a/target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch b/target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch
new file mode 100644 (file)
index 0000000..e838729
--- /dev/null
+++ b/target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch
@@ -0,0 +1,24 @@
+From 5001f2e1a325b68dbf225bd17f69a4d3d975cca5 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Thu, 9 Mar 2017 09:31:44 +0100
+Subject: [PATCH 61/69] mtd: "rootfs" conflicts with OpenWrt auto mounting
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ drivers/mtd/parsers/qcomsmempart.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/mtd/parsers/qcomsmempart.c
++++ b/drivers/mtd/parsers/qcomsmempart.c
+@@ -132,6 +132,11 @@ static int parse_qcomsmem_part(struct mt
+               parts[i].offset = le32_to_cpu(pentry->offset) * mtd->erasesize;
+               parts[i].mask_flags = pentry->attr;
+               parts[i].size = le32_to_cpu(pentry->length) * mtd->erasesize;
++
++              /* "rootfs" conflicts with OpenWrt auto mounting */
++              if (mtd_type_is_nand(mtd) && !strcmp(name, "rootfs"))
++                      parts[i].name = "ubi";
++
+               pr_debug("%d: %s offs=0x%08x size=0x%08x attr:0x%08x\n",
+                        i, pentry->name, le32_to_cpu(pentry->offset),
+                        le32_to_cpu(pentry->length), pentry->attr);