From 5a09eb17c2ca3a8fea09509b09edb30c54e9316e Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 30 Mar 2022 09:42:31 +0100 Subject: kernel: bump 5.15 to 5.15.32 Patches automatically rebased. Signed-off-by: Rui Salvaterra --- .../102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 index 5055261c4b..673c66ae84 100644 --- 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 @@ -10,16 +10,16 @@ Signed-off-by: John Crispin --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -139,7 +139,11 @@ +@@ -50,7 +50,11 @@ static struct mtd_info *allocate_partiti /* allocate the partition structure */ child = kzalloc(sizeof(*child), GFP_KERNEL); +- name = kstrdup(part->name, GFP_KERNEL); + /* "rootfs" conflicts with OpenWrt auto mounting */ + if (mtd_type_is_nand(parent) && !strcmp(part->name, "rootfs")) + name = "ubi"; + else + name = kstrdup(part->name, GFP_KERNEL); -- name = kstrdup(part->name, GFP_KERNEL); if (!name || !child) { printk(KERN_ERR"memory allocation error while creating partitions for \"%s\"\n", parent->name); -- cgit v1.2.3