Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/, arch/s390/, arch/x86/, arch/ppc/, arch/sparc64/, arch/x86_64/
Date: Mon, 02 Jan 2017 22:41:44
Message-Id: 1483396356.9c61b0e5027ebd15db88d22f1db1b340aeb82412.robbat2@gentoo
1 commit: 9c61b0e5027ebd15db88d22f1db1b340aeb82412
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 22:32:36 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 22:32:36 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9c61b0e5
7
8 kconfig: disable MULTIPATH by default, enabled by --multipath
9
10 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
11
12 arch/ppc/kernel-config | 4 ++--
13 arch/s390/kernel-config | 2 +-
14 arch/sparc64/kernel-config | 4 ++--
15 arch/x86/kernel-config | 8 ++++----
16 arch/x86_64/kernel-config | 2 +-
17 defaults/kernel-config | 8 ++++----
18 defaults/kernel-generic-config | 12 ++++++------
19 7 files changed, 20 insertions(+), 20 deletions(-)
20
21 diff --git a/arch/ppc/kernel-config b/arch/ppc/kernel-config
22 index c8b8e6a..06b81a6 100644
23 --- a/arch/ppc/kernel-config
24 +++ b/arch/ppc/kernel-config
25 @@ -807,8 +807,8 @@ CONFIG_DM_CRYPT=m
26 CONFIG_DM_SNAPSHOT=m
27 CONFIG_DM_MIRROR=m
28 CONFIG_DM_ZERO=m
29 -CONFIG_DM_MULTIPATH=m
30 -CONFIG_DM_MULTIPATH_EMC=m
31 +# CONFIG_DM_MULTIPATH is not set
32 +# CONFIG_DM_MULTIPATH_EMC is not set
33 # CONFIG_DM_MULTIPATH_RDAC is not set
34 # CONFIG_DM_DELAY is not set
35 CONFIG_BLK_DEV_DM_BBR=m
36
37 diff --git a/arch/s390/kernel-config b/arch/s390/kernel-config
38 index cae82b8..afd0127 100644
39 --- a/arch/s390/kernel-config
40 +++ b/arch/s390/kernel-config
41 @@ -739,7 +739,7 @@ CONFIG_DM_MIRROR=m
42 # CONFIG_DM_LOG_USERSPACE is not set
43 # CONFIG_DM_RAID is not set
44 CONFIG_DM_ZERO=m
45 -CONFIG_DM_MULTIPATH=m
46 +# CONFIG_DM_MULTIPATH is not set
47 # CONFIG_DM_MULTIPATH_QL is not set
48 # CONFIG_DM_MULTIPATH_ST is not set
49 # CONFIG_DM_DELAY is not set
50
51 diff --git a/arch/sparc64/kernel-config b/arch/sparc64/kernel-config
52 index 21ea9fb..fbc6809 100644
53 --- a/arch/sparc64/kernel-config
54 +++ b/arch/sparc64/kernel-config
55 @@ -802,8 +802,8 @@ CONFIG_DM_CRYPT=m
56 CONFIG_DM_SNAPSHOT=m
57 CONFIG_DM_MIRROR=m
58 CONFIG_DM_ZERO=m
59 -CONFIG_DM_MULTIPATH=m
60 -CONFIG_DM_MULTIPATH_EMC=m
61 +# CONFIG_DM_MULTIPATH is not set
62 +# CONFIG_DM_MULTIPATH_EMC is not set
63 CONFIG_BLK_DEV_DM_BBR=m
64
65 #
66
67 diff --git a/arch/x86/kernel-config b/arch/x86/kernel-config
68 index a3076f9..a71a75b 100644
69 --- a/arch/x86/kernel-config
70 +++ b/arch/x86/kernel-config
71 @@ -1352,10 +1352,10 @@ CONFIG_DM_CRYPT=m
72 CONFIG_DM_SNAPSHOT=m
73 CONFIG_DM_MIRROR=m
74 CONFIG_DM_ZERO=m
75 -CONFIG_DM_MULTIPATH=m
76 -CONFIG_DM_MULTIPATH_EMC=m
77 -CONFIG_DM_MULTIPATH_RDAC=m
78 -CONFIG_DM_MULTIPATH_HP=m
79 +# CONFIG_DM_MULTIPATH is not set
80 +# CONFIG_DM_MULTIPATH_EMC is not set
81 +# CONFIG_DM_MULTIPATH_RDAC is not set
82 +# CONFIG_DM_MULTIPATH_HP is not set
83 # CONFIG_DM_DELAY is not set
84 CONFIG_DM_UEVENT=y
85 CONFIG_BLK_DEV_DM_BBR=m
86
87 diff --git a/arch/x86_64/kernel-config b/arch/x86_64/kernel-config
88 index 2f539a8..8d39327 100644
89 --- a/arch/x86_64/kernel-config
90 +++ b/arch/x86_64/kernel-config
91 @@ -1406,7 +1406,7 @@ CONFIG_DM_SNAPSHOT=m
92 CONFIG_DM_MIRROR=m
93 # CONFIG_DM_LOG_USERSPACE is not set
94 CONFIG_DM_ZERO=m
95 -CONFIG_DM_MULTIPATH=m
96 +# CONFIG_DM_MULTIPATH is not set
97 # CONFIG_DM_MULTIPATH_QL is not set
98 # CONFIG_DM_MULTIPATH_ST is not set
99 # CONFIG_DM_DELAY is not set
100
101 diff --git a/defaults/kernel-config b/defaults/kernel-config
102 index 26ffbfd..aba35fd 100644
103 --- a/defaults/kernel-config
104 +++ b/defaults/kernel-config
105 @@ -1347,10 +1347,10 @@ CONFIG_DM_CRYPT=m
106 CONFIG_DM_SNAPSHOT=m
107 CONFIG_DM_MIRROR=m
108 CONFIG_DM_ZERO=m
109 -CONFIG_DM_MULTIPATH=m
110 -CONFIG_DM_MULTIPATH_EMC=m
111 -CONFIG_DM_MULTIPATH_RDAC=m
112 -CONFIG_DM_MULTIPATH_HP=m
113 +# CONFIG_DM_MULTIPATH is not set
114 +# CONFIG_DM_MULTIPATH_EMC is not set
115 +# CONFIG_DM_MULTIPATH_RDAC is not set
116 +# CONFIG_DM_MULTIPATH_HP is not set
117 # CONFIG_DM_DELAY is not set
118 CONFIG_DM_UEVENT=y
119 CONFIG_BLK_DEV_DM_BBR=m
120
121 diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
122 index aa4f11b..518733e 100644
123 --- a/defaults/kernel-generic-config
124 +++ b/defaults/kernel-generic-config
125 @@ -719,16 +719,16 @@ CONFIG_DM_CRYPT=m
126 # CONFIG_DM_DEBUG is not set
127 CONFIG_DM_DELAY=m
128 CONFIG_DM_MIRROR=m
129 -CONFIG_DM_MULTIPATH=m
130 -CONFIG_DM_MULTIPATH_EMC=m
131 -CONFIG_DM_MULTIPATH_HP=m
132 -CONFIG_DM_MULTIPATH_RDAC=m
133 +# CONFIG_DM_MULTIPATH is not set
134 +# CONFIG_DM_MULTIPATH_EMC is not set
135 +# CONFIG_DM_MULTIPATH_HP is not set
136 +# CONFIG_DM_MULTIPATH_RDAC is not set
137 CONFIG_DM_SNAPSHOT=m
138 CONFIG_DM_UEVENT=y
139 CONFIG_DM_ZERO=m
140 CONFIG_DM_LOG_USERSPACE=m
141 -CONFIG_DM_MULTIPATH_QL=m
142 -CONFIG_DM_MULTIPATH_ST=m
143 +# CONFIG_DM_MULTIPATH_QL is not set
144 +# CONFIG_DM_MULTIPATH_ST is not set
145
146 #
147 # Fusion MPT device support