[gentoo-commits] proj/linux-patches:4.17 commit in: /

[Mike Pagano]

commit:     2dfff68d42f70e408cccc3aec773bd715db182e9
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 22:18:10 2018 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 22:18:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=2dfff68d

Remove 2900_dev-root-proc-mount-fix.patch for compilation errors.

Will take a look after this release.

 0000_README                        |  4 ----
 2900_dev-root-proc-mount-fix.patch | 38 --------------------------------------
 2 files changed, 42 deletions(-)

diff --git a/0000_README b/0000_README
index 6546583..94eb66a 100644
--- a/0000_README
+++ b/0000_README
@@ -63,10 +63,6 @@ Patch:  2600_enable-key-swapping-for-apple-mac.patch
 From:   https://github.com/free5lot/hid-apple-patched
 Desc:   This hid-apple patch enables swapping of the FN and left Control keys and some additional on some apple keyboards. See bug #622902
 
-Patch:  2900_dev-root-proc-mount-fix.patch
-From:   https://bugs.gentoo.org/show_bug.cgi?id=438380
-Desc:   Ensure that /dev/root doesn't appear in /proc/mounts when bootint without an initramfs.
-
 Patch:  4200_fbcondecor.patch
 From:   http://www.mepiscommunity.org/fbcondecor
 Desc:   Bootsplash ported by Conrad Kostecki. (Bug #637434)

diff --git a/2900_dev-root-proc-mount-fix.patch b/2900_dev-root-proc-mount-fix.patch
deleted file mode 100644
index 83f96d2..0000000
--- a/2900_dev-root-proc-mount-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/init/do_mounts.c	2018-05-23 14:30:36.870899527 -0400
-+++ b/init/do_mounts.c	2018-05-23 14:35:54.398659105 -0400
-@@ -489,7 +489,11 @@ void __init change_floppy(char *fmt, ...
- 	va_start(args, fmt);
- 	vsprintf(buf, fmt, args);
- 	va_end(args);
--	fd = ksys_open("/dev/root", O_RDWR | O_NDELAY, 0);
-+	if (saved_root_name[0])
-+		fd = sys_open(saved_root_name, O_RDWR | O_NDELAY, 0);
-+	else
-+		fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
-+
- 	if (fd >= 0) {
- 		ksys_ioctl(fd, FDEJECT, 0);
- 		ksys_close(fd);
-@@ -533,11 +537,17 @@ void __init mount_root(void)
- #endif
- #ifdef CONFIG_BLOCK
- 	{
--		int err = create_dev("/dev/root", ROOT_DEV);
--
--		if (err < 0)
--			pr_emerg("Failed to create /dev/root: %d\n", err);
--		mount_block_root("/dev/root", root_mountflags);
-+		if (saved_root_name[0] == '/') {
-+			int err = create_dev(saved_root_name, ROOT_DEV);
-+			if (err < 0)
-+				pr_emerg("Failed to create %s: %d\n", saved_root_name, err);
-+			mount_block_root(saved_root_name, root_mountflags);
-+		} else {
-+			int err = create_dev("/dev/root", ROOT_DEV);
-+			if (err < 0)
-+				pr_emerg("Failed to create /dev/root: %d\n", err);
-+			mount_block_root("/dev/root", root_mountflags);
-+		}
- 	}
- #endif
- }