Disable CONFIG_VIRTIO_BLK_SCSI

Per comments from Christoph Hellwig
lkml.kernel.org/r/<20170917235731.GA31789@infradead.org>

22 files changed, 24 insertions, 21 deletions

diff --git a/baseconfig/CONFIG_VIRTIO_BLK_SCSI b/baseconfig/CONFIG_VIRTIO_BLK_SCSI
index dcc60f529..e551a8ba1 100644
--- a/baseconfig/CONFIG_VIRTIO_BLK_SCSI
+++ b/baseconfig/CONFIG_VIRTIO_BLK_SCSI
@@ -1 +1 @@
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 8e71f5184..2dee2256b 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6364,7 +6364,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 0caaf8d28..05c85d05c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6341,7 +6341,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 78ac44492..309d67aa8 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6925,7 +6925,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 1bcd4a572..f0d4356d0 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6474,7 +6474,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6d48fd7bd..02074d46f 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6451,7 +6451,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index fb5cf3254..04230bd71 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6902,7 +6902,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 13c5db0c4..1a7a0db00 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -5961,7 +5961,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 25f47f624..85b1679b0 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -5983,7 +5983,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 291cee7a0..c2fc1f7e2 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5983,7 +5983,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 42991c6b5..579e0696f 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5961,7 +5961,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 3d82e62f5..1da154ee7 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -5759,7 +5759,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index f3434f5dc..cacb21165 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -5735,7 +5735,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 6ffe76755..2294fec5b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5687,7 +5687,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 5cfc41a10..ebd643140 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5663,7 +5663,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 5871cc209..fb2df73e7 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -5686,7 +5686,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index df57b6443..1cca4702c 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -5662,7 +5662,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 74e917abe..812d974f8 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5581,7 +5581,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 3e532ae5b..89db07c06 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5557,7 +5557,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 0d60def84..34fe8e0b6 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6035,7 +6035,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 6126b1c2a..ffc9196ed 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6013,7 +6013,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel.spec b/kernel.spec
index c8b3ce95a..e8b5607b3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2196,6 +2196,9 @@ fi
 #
 #
 %changelog
+* Tue Sep 19 2017 Laura Abbott <labbott@redhat.com>
+- Disable CONFIG_VIRTIO_BLK_SCSI
+
 * Tue Sep 19 2017 Justin M. Forbes <jforbes@redhat.com> - 4.14.0-0.rc1.git1.1
 - Linux v4.14-rc1-13-gebb2c2437d80
 - Reenable debugging options.