From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B69C138334 for ; Sun, 3 Jun 2018 22:19:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8247BE0B21; Sun, 3 Jun 2018 22:19:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B740E0B21 for ; Sun, 3 Jun 2018 22:19:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5277B335C72 for ; Sun, 3 Jun 2018 22:19:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF87429E for ; Sun, 3 Jun 2018 22:19:01 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1528064290.2dfff68d42f70e408cccc3aec773bd715db182e9.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:4.17 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 2900_dev-root-proc-mount-fix.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 2dfff68d42f70e408cccc3aec773bd715db182e9 X-VCS-Branch: 4.17 Date: Sun, 3 Jun 2018 22:19:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e310de75-22f9-4b0e-be31-9a0a56c56eaf X-Archives-Hash: 426060b09e26bd1a041fe9bad44f8e25 commit: 2dfff68d42f70e408cccc3aec773bd715db182e9 Author: Mike Pagano gentoo org> AuthorDate: Sun Jun 3 22:18:10 2018 +0000 Commit: Mike Pagano gentoo 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 - }