diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-30 09:42:31 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-09 19:31:46 +0200 |
| commit | 5a09eb17c2ca3a8fea09509b09edb30c54e9316e (patch) | |
| tree | 089f490a215b4dba2ef10cb921bac121ce15d83b /target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch | |
| parent | a98ded6c5c1891087fb43499829928b3bc17702f (diff) | |
| download | upstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.tar.gz upstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.tar.bz2 upstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.zip | |
kernel: bump 5.15 to 5.15.32
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch')
| -rw-r--r-- | target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 <john@phrozen.org> --- 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); |