kernel: bump 4.14 to 4.14.48 for 18.06

[openwrt/openwrt.git] / target / linux / ipq806x / patches-4.14 / 0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch

diff --git a/target/linux/ipq806x/patches-4.14/0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch b/target/linux/ipq806x/patches-4.14/0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch
index ce1809340649627be9bfba1a4c8ee1cd713a294e..a4a957545b9bf1b5ac4a79fcae1c8fb175500cfa 100644 (file)
--- a/target/linux/ipq806x/patches-4.14/0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch
+++ b/target/linux/ipq806x/patches-4.14/0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch
@@ -11,13 +11,13 @@ Signed-off-by: John Crispin <john@phrozen.org>
 --- a/drivers/mtd/qcom_smem_part.c
 +++ b/drivers/mtd/qcom_smem_part.c
 @@ -189,6 +189,10 @@ static int parse_qcom_smem_partitions(st
-               m_part->size = le32_to_cpu(s_part->size) * (*smem_blksz);
-               m_part->offset = le32_to_cpu(s_part->start) * (*smem_blksz);
-
+               m_part->size = le32_to_cpu(s_part->size) * (*smem_blksz);
+               m_part->offset = le32_to_cpu(s_part->start) * (*smem_blksz);
+ 
 +              /* "rootfs" conflicts with OpenWrt auto mounting */
 +              if (mtd_type_is_nand(master) && !strcmp(m_part->name, "rootfs"))
 +                      m_part->name = "ubi";
 +
-               /*
-                * The last SMEM partition may have its size marked as
-                * something like 0xffffffff, which means "until the end of the
+               /*
+                * The last SMEM partition may have its size marked as
+                * something like 0xffffffff, which means "until the end of the