1 |
commit: 101fdc9d9dd27b83249c9356a5df5ee02c9cf4cc |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 2 22:38:07 2017 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 2 22:38:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=101fdc9d |
7 |
|
8 |
kconfig: Disable iSCSI by default, use --iscsi. |
9 |
|
10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
11 |
|
12 |
arch/alpha/kernel-config | 4 ++-- |
13 |
arch/ppc/kernel-config | 4 ++-- |
14 |
arch/x86/kernel-config | 6 +++--- |
15 |
arch/x86_64/kernel-config | 4 ++-- |
16 |
defaults/kernel-config | 6 +++--- |
17 |
defaults/kernel-generic-config | 16 ++++++++-------- |
18 |
6 files changed, 20 insertions(+), 20 deletions(-) |
19 |
|
20 |
diff --git a/arch/alpha/kernel-config b/arch/alpha/kernel-config |
21 |
index 1297c8d..046ce01 100644 |
22 |
--- a/arch/alpha/kernel-config |
23 |
+++ b/arch/alpha/kernel-config |
24 |
@@ -412,7 +412,7 @@ CONFIG_SCSI_WAIT_SCAN=m |
25 |
# |
26 |
CONFIG_SCSI_SPI_ATTRS=y |
27 |
CONFIG_SCSI_FC_ATTRS=y |
28 |
-CONFIG_SCSI_ISCSI_ATTRS=y |
29 |
+# CONFIG_SCSI_ISCSI_ATTRS is not set |
30 |
CONFIG_SCSI_SAS_ATTRS=y |
31 |
CONFIG_SCSI_SAS_LIBSAS=y |
32 |
CONFIG_SCSI_SAS_LIBSAS_DEBUG=y |
33 |
@@ -475,7 +475,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y |
34 |
CONFIG_SCSI_QLOGIC_FAS=y |
35 |
CONFIG_SCSI_QLOGIC_1280=y |
36 |
CONFIG_SCSI_QLA_FC=y |
37 |
-CONFIG_SCSI_QLA_ISCSI=y |
38 |
+# CONFIG_SCSI_QLA_ISCSI is not set |
39 |
# CONFIG_SCSI_LPFC is not set |
40 |
CONFIG_SCSI_SIM710=y |
41 |
CONFIG_SCSI_SYM53C416=y |
42 |
|
43 |
diff --git a/arch/ppc/kernel-config b/arch/ppc/kernel-config |
44 |
index 06b81a6..57daba1 100644 |
45 |
--- a/arch/ppc/kernel-config |
46 |
+++ b/arch/ppc/kernel-config |
47 |
@@ -663,7 +663,7 @@ CONFIG_SCSI_WAIT_SCAN=m |
48 |
# |
49 |
CONFIG_SCSI_SPI_ATTRS=m |
50 |
CONFIG_SCSI_FC_ATTRS=m |
51 |
-CONFIG_SCSI_ISCSI_ATTRS=m |
52 |
+# CONFIG_SCSI_ISCSI_ATTRS is not set |
53 |
CONFIG_SCSI_SAS_ATTRS=m |
54 |
CONFIG_SCSI_SAS_LIBSAS=m |
55 |
# CONFIG_SCSI_SAS_ATA is not set |
56 |
@@ -724,7 +724,7 @@ CONFIG_SCSI_IPR=m |
57 |
# CONFIG_SCSI_IPR_DUMP is not set |
58 |
CONFIG_SCSI_QLOGIC_1280=m |
59 |
CONFIG_SCSI_QLA_FC=m |
60 |
-CONFIG_SCSI_QLA_ISCSI=m |
61 |
+# CONFIG_SCSI_QLA_ISCSI is not set |
62 |
CONFIG_SCSI_LPFC=m |
63 |
CONFIG_SCSI_DC395x=m |
64 |
CONFIG_SCSI_DC390T=m |
65 |
|
66 |
diff --git a/arch/x86/kernel-config b/arch/x86/kernel-config |
67 |
index a71a75b..2fea553 100644 |
68 |
--- a/arch/x86/kernel-config |
69 |
+++ b/arch/x86/kernel-config |
70 |
@@ -1173,7 +1173,7 @@ CONFIG_SCSI_WAIT_SCAN=m |
71 |
CONFIG_SCSI_SPI_ATTRS=m |
72 |
CONFIG_SCSI_FC_ATTRS=m |
73 |
CONFIG_SCSI_FC_TGT_ATTRS=y |
74 |
-CONFIG_SCSI_ISCSI_ATTRS=y |
75 |
+# CONFIG_SCSI_ISCSI_ATTRS is not set |
76 |
CONFIG_SCSI_SAS_ATTRS=m |
77 |
CONFIG_SCSI_SAS_LIBSAS=m |
78 |
CONFIG_SCSI_SAS_ATA=y |
79 |
@@ -1181,7 +1181,7 @@ CONFIG_SCSI_SAS_ATA=y |
80 |
CONFIG_SCSI_SRP_ATTRS=m |
81 |
CONFIG_SCSI_SRP_TGT_ATTRS=y |
82 |
CONFIG_SCSI_LOWLEVEL=y |
83 |
-CONFIG_ISCSI_TCP=y |
84 |
+# CONFIG_ISCSI_TCP is not set |
85 |
CONFIG_BLK_DEV_3W_XXXX_RAID=m |
86 |
CONFIG_SCSI_3W_9XXX=m |
87 |
CONFIG_SCSI_7000FASST=m |
88 |
@@ -1250,7 +1250,7 @@ CONFIG_SCSI_PSI240I=m |
89 |
CONFIG_SCSI_QLOGIC_FAS=m |
90 |
CONFIG_SCSI_QLOGIC_1280=m |
91 |
CONFIG_SCSI_QLA_FC=m |
92 |
-CONFIG_SCSI_QLA_ISCSI=m |
93 |
+# CONFIG_SCSI_QLA_ISCSI is not set |
94 |
CONFIG_SCSI_LPFC=m |
95 |
CONFIG_SCSI_SEAGATE=m |
96 |
CONFIG_SCSI_SYM53C416=m |
97 |
|
98 |
diff --git a/arch/x86_64/kernel-config b/arch/x86_64/kernel-config |
99 |
index 8d39327..3e99ec9 100644 |
100 |
--- a/arch/x86_64/kernel-config |
101 |
+++ b/arch/x86_64/kernel-config |
102 |
@@ -1202,7 +1202,7 @@ CONFIG_SCSI_WAIT_SCAN=m |
103 |
CONFIG_SCSI_SPI_ATTRS=m |
104 |
CONFIG_SCSI_FC_ATTRS=m |
105 |
CONFIG_SCSI_FC_TGT_ATTRS=y |
106 |
-CONFIG_SCSI_ISCSI_ATTRS=m |
107 |
+# CONFIG_SCSI_ISCSI_ATTRS is not set |
108 |
CONFIG_SCSI_SAS_ATTRS=m |
109 |
CONFIG_SCSI_SAS_LIBSAS=m |
110 |
CONFIG_SCSI_SAS_ATA=y |
111 |
@@ -1278,7 +1278,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y |
112 |
# CONFIG_SCSI_IPR is not set |
113 |
CONFIG_SCSI_QLOGIC_1280=m |
114 |
CONFIG_SCSI_QLA_FC=m |
115 |
-CONFIG_SCSI_QLA_ISCSI=m |
116 |
+# CONFIG_SCSI_QLA_ISCSI is not set |
117 |
CONFIG_SCSI_LPFC=m |
118 |
CONFIG_SCSI_DC395x=m |
119 |
CONFIG_SCSI_DC390T=m |
120 |
|
121 |
diff --git a/defaults/kernel-config b/defaults/kernel-config |
122 |
index aba35fd..046a9f3 100644 |
123 |
--- a/defaults/kernel-config |
124 |
+++ b/defaults/kernel-config |
125 |
@@ -1168,7 +1168,7 @@ CONFIG_SCSI_WAIT_SCAN=m |
126 |
CONFIG_SCSI_SPI_ATTRS=m |
127 |
CONFIG_SCSI_FC_ATTRS=m |
128 |
CONFIG_SCSI_FC_TGT_ATTRS=y |
129 |
-CONFIG_SCSI_ISCSI_ATTRS=y |
130 |
+# CONFIG_SCSI_ISCSI_ATTRS is not set |
131 |
CONFIG_SCSI_SAS_ATTRS=m |
132 |
CONFIG_SCSI_SAS_LIBSAS=m |
133 |
CONFIG_SCSI_SAS_ATA=y |
134 |
@@ -1176,7 +1176,7 @@ CONFIG_SCSI_SAS_ATA=y |
135 |
CONFIG_SCSI_SRP_ATTRS=m |
136 |
CONFIG_SCSI_SRP_TGT_ATTRS=y |
137 |
CONFIG_SCSI_LOWLEVEL=y |
138 |
-CONFIG_ISCSI_TCP=y |
139 |
+# CONFIG_ISCSI_TCP is not set |
140 |
CONFIG_BLK_DEV_3W_XXXX_RAID=m |
141 |
CONFIG_SCSI_3W_9XXX=m |
142 |
CONFIG_SCSI_7000FASST=m |
143 |
@@ -1245,7 +1245,7 @@ CONFIG_SCSI_PSI240I=m |
144 |
CONFIG_SCSI_QLOGIC_FAS=m |
145 |
CONFIG_SCSI_QLOGIC_1280=m |
146 |
CONFIG_SCSI_QLA_FC=m |
147 |
-CONFIG_SCSI_QLA_ISCSI=m |
148 |
+# CONFIG_SCSI_QLA_ISCSI is not set |
149 |
CONFIG_SCSI_LPFC=m |
150 |
CONFIG_SCSI_SEAGATE=m |
151 |
CONFIG_SCSI_SYM53C416=m |
152 |
|
153 |
diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config |
154 |
index 518733e..820b49b 100644 |
155 |
--- a/defaults/kernel-generic-config |
156 |
+++ b/defaults/kernel-generic-config |
157 |
@@ -516,7 +516,7 @@ CONFIG_SCSI_LOGGING=y |
158 |
CONFIG_SCSI_SPI_ATTRS=m |
159 |
CONFIG_SCSI_FC_ATTRS=m |
160 |
CONFIG_SCSI_FC_TGT_ATTRS=y |
161 |
-CONFIG_SCSI_ISCSI_ATTRS=m |
162 |
+# CONFIG_SCSI_ISCSI_ATTRS is not set |
163 |
CONFIG_SCSI_SAS_ATTRS=m |
164 |
CONFIG_SCSI_SRP_TGT_ATTRS=y |
165 |
CONFIG_SCSI_SAS_LIBSAS=m |
166 |
@@ -525,7 +525,7 @@ CONFIG_SCSI_SAS_ATA=y |
167 |
CONFIG_SCSI_SAS_HOST_SMP=y |
168 |
CONFIG_RAID_ATTRS=m |
169 |
|
170 |
-CONFIG_ISCSI_TCP=m |
171 |
+# CONFIG_ISCSI_TCP is not set |
172 |
|
173 |
# |
174 |
# SCSI low-level drivers |
175 |
@@ -573,8 +573,8 @@ CONFIG_SCSI_OSD_DPRINT_SENSE=1 |
176 |
|
177 |
CONFIG_SCSI_HPSA=m |
178 |
|
179 |
-CONFIG_SCSI_BNX2_ISCSI=m |
180 |
-CONFIG_BE2ISCSI=m |
181 |
+# CONFIG_SCSI_BNX2_ISCSI is not set |
182 |
+# CONFIG_BE2ISCSI is not set |
183 |
CONFIG_SCSI_PMCRAID=m |
184 |
|
185 |
|
186 |
@@ -681,7 +681,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y |
187 |
# CONFIG_SCSI_DEBUG is not set |
188 |
# CONFIG_SCSI_DC390T is not set |
189 |
CONFIG_SCSI_QLA_FC=m |
190 |
-CONFIG_SCSI_QLA_ISCSI=m |
191 |
+# CONFIG_SCSI_QLA_ISCSI is not set |
192 |
# CONFIG_SCSI_IPR is not set |
193 |
# CONFIG_SCSI_DPT_I2O is not set |
194 |
CONFIG_SCSI_LPFC=m |
195 |
@@ -4334,7 +4334,7 @@ CONFIG_EARLY_PRINTK_DBGP=y |
196 |
|
197 |
CONFIG_SECURITYFS=y |
198 |
|
199 |
-CONFIG_SCSI_CXGB3_ISCSI=m |
200 |
+# CONFIG_SCSI_CXGB3_ISCSI is not set |
201 |
CONFIG_LIBFC=m |
202 |
CONFIG_LIBFCOE=m |
203 |
CONFIG_FCOE=m |
204 |
@@ -4531,8 +4531,8 @@ CONFIG_OPTPROBES=y |
205 |
CONFIG_INFINIBAND_CXGB4=m |
206 |
CONFIG_NF_CONNTRACK_SNMP=m |
207 |
CONFIG_LOCKUP_DETECTOR=y |
208 |
-CONFIG_ISCSI_BOOT_SYSFS=m |
209 |
-CONFIG_SCSI_CXGB4_ISCSI=m |
210 |
+# CONFIG_ISCSI_BOOT_SYSFS is not set |
211 |
+# CONFIG_SCSI_CXGB4_ISCSI is not set |
212 |
CONFIG_BNA=m |
213 |
CONFIG_MEMSTICK_R592=m |
214 |
CONFIG_RC_CORE=m |