summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-05-10 08:24:56 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-05-10 08:25:00 -0400
commit802cbf85094c1f8456e447e819a7a605913ebef4 (patch)
treeebfead2a3459c3830dcf0a7d3d2412c35455bc13
parent4bf3dea79c530f3cafbc0050a76801d80ea800f0 (diff)
downloadkernel-802cbf85094c1f8456e447e819a7a605913ebef4.tar.gz
kernel-802cbf85094c1f8456e447e819a7a605913ebef4.tar.xz
kernel-802cbf85094c1f8456e447e819a7a605913ebef4.zip
Enable XEN SCSI front and backend (rhbz 1334512)
-rw-r--r--config-x86-generic4
-rw-r--r--kernel.spec1
2 files changed, 3 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic
index d21a99f58..06ddcd1a0 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -317,8 +317,8 @@ CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
CONFIG_XEN_SELFBALLOONING=y
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_SCSI_FRONTEND is not set
-# CONFIG_XEN_SCSI_BACKEND is not set
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_SYMS=y
CONFIG_SPI=y
diff --git a/kernel.spec b/kernel.spec
index d78545012..0f8fa5aa8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2149,6 +2149,7 @@ fi
#
%changelog
* Tue May 10 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable XEN SCSI front and backend (rhbz 1334512)
- CVE-2016-4569 info leak in sound module (rhbz 1334643 1334645)
* Mon May 09 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc7.git0.1