Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:3.4 commit in: /
Date: Fri, 02 Jan 2015 19:13:22
Message-Id: 1420225997.dfe6365f65151c8d97374bb967301fd419b38a88.mpagano@gentoo
1 commit: dfe6365f65151c8d97374bb967301fd419b38a88
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 2 19:13:17 2015 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 2 19:13:17 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=dfe6365f
7
8 Add DEVPTS_MULTIPLE_INSTANCES when GENTOO_LINUX_INIT_SYSTEMD is selected. See bug #534216
9
10 ---
11 4567_distro-Gentoo-Kconfig.patch | 15 +++++++--------
12 1 file changed, 7 insertions(+), 8 deletions(-)
13
14 diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch
15 index 850cabc..690454a 100644
16 --- a/4567_distro-Gentoo-Kconfig.patch
17 +++ b/4567_distro-Gentoo-Kconfig.patch
18 @@ -1,5 +1,5 @@
19 ---- a/Kconfig 2014-04-02 10:11:12.959212144 -0400
20 -+++ b/Kconfig 2014-04-02 10:11:41.139211921 -0400
21 +--- a/Kconfig 2014-04-02 09:45:05.389224541 -0400
22 ++++ b/Kconfig 2014-04-02 09:45:39.269224273 -0400
23 @@ -8,4 +8,6 @@ config SRCARCH
24 string
25 option env="SRCARCH"
26 @@ -7,9 +7,9 @@
27 +source "distro/Kconfig"
28 +
29 source "arch/$SRCARCH/Kconfig"
30 ---- 1969-12-31 19:00:00.000000000 -0500
31 -+++ b/distro/Kconfig 2014-04-02 10:14:34.049210553 -0400
32 -@@ -0,0 +1,110 @@
33 +--- a/distro/Kconfig 1969-12-31 19:00:00.000000000 -0500
34 ++++ b/distro/Kconfig 2015-01-02 13:54:45.589830665 -0500
35 +@@ -0,0 +1,109 @@
36 +menu "Gentoo Linux"
37 +
38 +config GENTOO_LINUX
39 @@ -35,7 +35,6 @@
40 + select TMPFS
41 +
42 + select MMU
43 -+ select HOTPLUG
44 + select SHMEM
45 +
46 + help
47 @@ -88,13 +87,13 @@
48 + select AUTOFS4_FS
49 + select BLK_DEV_BSG
50 + select CGROUPS
51 ++ select DEVPTS_MULTIPLE_INSTANCES
52 + select EPOLL
53 + select FANOTIFY
54 + select FHANDLE
55 -+ select HOTPLUG
56 + select INOTIFY_USER
57 + select NET
58 -+ select NET_NS
59 ++ select NET_NS
60 + select PROC_FS
61 + select SIGNALFD
62 + select SYSFS