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 2d44df3b4..d387b37cc 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6297,7 +6297,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 9a49d1793..6ff7ca034 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6274,7 +6274,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 0187d8cbb..47351193e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6861,7 +6861,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 03c99aec4..b08d09dcc 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6412,7 +6412,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 3ac1bd2b6..d4c97b43c 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6389,7 +6389,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 eef755f6a..0420cfc30 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6838,7 +6838,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 4f8f7fdb9..7b13eac46 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -5904,7 +5904,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 098c8dc37..8a1b4f5f7 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -5926,7 +5926,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 c960be760..7d6f366a8 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5926,7 +5926,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 5e77c7016..547ba49fd 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5904,7 +5904,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 d51eebc58..94998183f 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -5704,7 +5704,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 46bb44a1b..c01895ad0 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -5680,7 +5680,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 75787145e..83849709d 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5632,7 +5632,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 7fc5ca96f..06032461e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5608,7 +5608,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 6b2d0ea01..58863a72b 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -5631,7 +5631,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 3444a6323..65820b7b9 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -5607,7 +5607,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 c46c8e88a..85191ea00 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5525,7 +5525,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 21f70f71c..4e31c70e3 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5501,7 +5501,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 f5fdc7629..3333a6d5a 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5973,7 +5973,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 c8334ad5e..4c2024cc1 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5951,7 +5951,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 19e62c34f..3882d791b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2225,6 +2225,9 @@ fi
 #
 #
 %changelog
+* Wed Sep 20 2017 Laura Abbott <labbott@redhat.com>
+- Disable CONFIG_VIRTIO_BLK_SCSI
+
 * Wed Sep 20 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.3-300
 - Linux v4.13.3
 - Fixes 1493435 1493436