diff options
| -rw-r--r-- | baseconfig/CONFIG_VIRTIO_BLK_SCSI | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 2 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 2 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 2 | ||||
| -rw-r--r-- | kernel-i686.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64p7-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64p7.config | 2 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
| -rw-r--r-- | kernel-s390x.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
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 968aa7b52..e8d66f5f3 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 4c6f8093f..840706241 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 93b6ae3b6..50d724180 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 4833be710..2a573b543 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 8d84bb0be..f97976b58 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 e1925a121..23162e3c2 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 3d927d3fc..220708267 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 9c38f64d8..aa682e2bb 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 b47aa8e3b..a3db5a25c 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 4bb76144a..dce3e21d2 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 b8d718400..d50b3fad7 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 426474708..5eb572f23 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 14bd4ea17..eeac56967 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 6ffd60269..08649333c 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 becaa6e45..fbd8644ee 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 bae0c717e..249c685ae 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 8a9fd31cf..5343911b7 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 382b67636..0d54c9dea 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 1198afc2c..2f4ed4e61 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 1a0451074..33c9c83a9 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 3034b9108..f620dc38b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2231,6 +2231,9 @@ fi # # %changelog +* Tue Sep 19 2017 Laura Abbott <labbott@redhat.com> +- Disable CONFIG_VIRTIO_BLK_SCSI + * Mon Sep 18 2017 Justin M. Forbes <jforbes@edoraproject.org> - Fixes for QXL (rhbz 1462381) - Fix rhbz 1431375 |