diff --git a/configs/fedora/generic/arm/CONFIG_SCSI_BUSLOGIC b/configs/fedora/generic/arm/CONFIG_SCSI_BUSLOGIC
new file mode 100644
index 000000000..c1a96e3d8
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_BUSLOGIC
@@ -0,0 +1 @@
+# CONFIG_SCSI_BUSLOGIC is not set
diff --git a/configs/fedora/generic/CONFIG_FCOE_FNIC b/configs/fedora/generic/x86/CONFIG_FCOE_FNIC
similarity index 100%
rename from configs/fedora/generic/CONFIG_FCOE_FNIC
rename to configs/fedora/generic/x86/CONFIG_FCOE_FNIC
diff --git a/configs/fedora/generic/CONFIG_SCSI_ISCI b/configs/fedora/generic/x86/CONFIG_SCSI_ISCI
similarity index 100%
rename from configs/fedora/generic/CONFIG_SCSI_ISCI
rename to configs/fedora/generic/x86/CONFIG_SCSI_ISCI
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ddebe832a..0339c47fe 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1815,7 +1815,6 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VT8623 is not set
 CONFIG_FB_XILINX=m
 CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
@@ -5206,7 +5205,7 @@ CONFIG_SCSI_ARCMSR=m
 # CONFIG_SCSI_BFA_FC is not set
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5235,7 +5234,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2bcbe0813..84f63315f 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1799,7 +1799,6 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VT8623 is not set
 CONFIG_FB_XILINX=m
 CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
@@ -5185,7 +5184,7 @@ CONFIG_SCSI_ARCMSR=m
 # CONFIG_SCSI_BFA_FC is not set
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5214,7 +5213,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 1427b2518..5d6c6b1dd 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1859,7 +1859,6 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VT8623 is not set
 # CONFIG_FB_XILINX is not set
 CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
@@ -5362,7 +5361,7 @@ CONFIG_SCSI_ARCMSR=m
 # CONFIG_SCSI_BFA_FC is not set
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5391,7 +5390,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index d64dcd0bb..7f7b8578a 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1793,7 +1793,6 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VT8623 is not set
 # CONFIG_FB_XILINX is not set
 CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
@@ -5116,7 +5115,7 @@ CONFIG_SCSI_ARCMSR=m
 # CONFIG_SCSI_BFA_FC is not set
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5145,7 +5144,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 43bf5431a..184baaccf 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1778,7 +1778,6 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VT8623 is not set
 # CONFIG_FB_XILINX is not set
 CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
@@ -5096,7 +5095,7 @@ CONFIG_SCSI_ARCMSR=m
 # CONFIG_SCSI_BFA_FC is not set
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5125,7 +5124,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 01dc968e0..48c72e646 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1844,7 +1844,6 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VT8623 is not set
 # CONFIG_FB_XILINX is not set
 CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
@@ -5342,7 +5341,7 @@ CONFIG_SCSI_ARCMSR=m
 # CONFIG_SCSI_BFA_FC is not set
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_CXGB3_ISCSI=m
@@ -5371,7 +5370,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 1303635a8..e67cdd2c3 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1443,7 +1443,6 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
 CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
@@ -4463,7 +4462,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a522782ee..b73ff5943 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1426,7 +1426,6 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
 CONFIG_FB=y
-CONFIG_FCOE_FNIC=m
 CONFIG_FCOE=m
 # CONFIG_FDDI is not set
 CONFIG_FEALNX=m
@@ -4441,7 +4440,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 8516929e5..d1785be62 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1445,7 +1445,6 @@ CONFIG_FB_VESA=y
 CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
-CONFIG_FCOE_FNIC=m
 # CONFIG_FCOE is not set
 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
@@ -4412,7 +4411,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 9af7d8f77..37ddf0387 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1428,7 +1428,6 @@ CONFIG_FB_VESA=y
 CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
-CONFIG_FCOE_FNIC=m
 # CONFIG_FCOE is not set
 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
@@ -4390,7 +4389,6 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set