generic: 6.6: manually refresh pending patches

[openwrt/staging/981213.git] / target / linux / generic / pending-6.6 / 511-init-bypass-device-lookup-for-dev-fit-rootfs.patch

diff --git a/target/linux/generic/pending-6.6/511-init-bypass-device-lookup-for-dev-fit-rootfs.patch b/target/linux/generic/pending-6.6/511-init-bypass-device-lookup-for-dev-fit-rootfs.patch
index 685a5f9da510baef08e5b3c01122cf59db39c054..e6ad1049818c687bce0506c84cadb9d12abdac4e 100644 (file)
--- a/target/linux/generic/pending-6.6/511-init-bypass-device-lookup-for-dev-fit-rootfs.patch
+++ b/target/linux/generic/pending-6.6/511-init-bypass-device-lookup-for-dev-fit-rootfs.patch
@@ -13,13 +13,13 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
-@@ -645,7 +645,8 @@ void __init prepare_namespace(void)
+@@ -463,7 +463,8 @@ static dev_t __init parse_root_device(char
+       int error;
+       dev_t dev;
  
-       if (saved_root_name[0]) {
-               root_device_name = saved_root_name;
--              if (!strncmp(root_device_name, "mtd", 3) ||
-+              if (!strncmp(root_device_name, "fit", 3) ||
-+                  !strncmp(root_device_name, "mtd", 3) ||
-                   !strncmp(root_device_name, "ubi", 3)) {
-                       mount_block_root(root_device_name, root_mountflags);
-                       goto out;
+-      if (!strncmp(root_device_name, "mtd", 3) ||
++      if (!strncmp(root_device_name, "fit", 3) ||
++          !strncmp(root_device_name, "mtd", 3) ||
+           !strncmp(root_device_name, "ubi", 3))
+               return Root_Generic;
+       if (strcmp(root_device_name, "/dev/nfs") == 0)