From 0d556acf992580081bc0292f0a70c33b3fca9b7d Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Sep 19 2017 17:23:39 +0000 Subject: Disable CONFIG_VIRTIO_BLK_SCSI Per comments from Christoph Hellwig lkml.kernel.org/r/<20170917235731.GA31789@infradead.org> --- diff --git a/baseconfig/CONFIG_VIRTIO_BLK_SCSI b/baseconfig/CONFIG_VIRTIO_BLK_SCSI index dcc60f5..e551a8b 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 968aa7b..e8d66f5 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -6310,7 +6310,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 4c6f809..8407062 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6287,7 +6287,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 93b6ae3..50d7241 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6876,7 +6876,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 4833be7..2a573b5 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6428,7 +6428,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 8d84bb0..f97976b 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6405,7 +6405,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 e1925a1..23162e3 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -6853,7 +6853,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 3d927d3..2207082 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -5909,7 +5909,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 9c38f64..aa682e2 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -5931,7 +5931,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 b47aa8e..a3db5a2 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5931,7 +5931,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 4bb7614..dce3e21 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5909,7 +5909,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 b8d7184..d50b3fa 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -5717,7 +5717,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 4264747..5eb572f 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -5693,7 +5693,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 14bd4ea..eeac569 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5645,7 +5645,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 6ffd602..0864933 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5621,7 +5621,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 becaa6e..fbd8644 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -5644,7 +5644,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 bae0c71..249c685 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -5620,7 +5620,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 8a9fd31..5343911 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5538,7 +5538,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 382b676..0d54c9d 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5514,7 +5514,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 1198afc..2f4ed4e 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5977,7 +5977,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 1a04510..33c9c83 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -5955,7 +5955,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 3034b91..f620dc3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2231,6 +2231,9 @@ fi # # %changelog +* Tue Sep 19 2017 Laura Abbott +- Disable CONFIG_VIRTIO_BLK_SCSI + * Mon Sep 18 2017 Justin M. Forbes - Fixes for QXL (rhbz 1462381) - Fix rhbz 1431375