summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2018-06-05 15:32:50 -0400
committerJeremy Cline <jcline@redhat.com>2018-06-05 17:14:56 -0400
commit659cba17dc6ad120c1b4909de6ee2fc3469eccaf (patch)
treefbbfafaf1358d60dcc52d89bec5a387fd826f7e3
parent930c3373a22804fbf2764b78bc89d8ccf8e47961 (diff)
downloadkernel-659cba17dc6ad120c1b4909de6ee2fc3469eccaf.tar.gz
kernel-659cba17dc6ad120c1b4909de6ee2fc3469eccaf.tar.xz
kernel-659cba17dc6ad120c1b4909de6ee2fc3469eccaf.zip
Enable CONFIG_SCSI_DH* for s390x (rhbz 1586189)
-rw-r--r--configs/fedora/generic/s390x/CONFIG_SCSI_DH1
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel.spec3
4 files changed, 5 insertions, 3 deletions
diff --git a/configs/fedora/generic/s390x/CONFIG_SCSI_DH b/configs/fedora/generic/s390x/CONFIG_SCSI_DH
deleted file mode 100644
index e5b8a74ea..000000000
--- a/configs/fedora/generic/s390x/CONFIG_SCSI_DH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_DH is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index b32e97398..d789f7b13 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4134,8 +4134,8 @@ CONFIG_SCSI_DEBUG=m
CONFIG_SCSI_DH_ALUA=m
CONFIG_SCSI_DH_EMC=m
CONFIG_SCSI_DH_HP_SW=m
-# CONFIG_SCSI_DH is not set
CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH=y
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_EATA is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 4113c9edd..e1a83b33b 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4110,8 +4110,8 @@ CONFIG_SCSI_DEBUG=m
CONFIG_SCSI_DH_ALUA=m
CONFIG_SCSI_DH_EMC=m
CONFIG_SCSI_DH_HP_SW=m
-# CONFIG_SCSI_DH is not set
CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH=y
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_EATA is not set
diff --git a/kernel.spec b/kernel.spec
index 852b68473..a4e0f98c7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1918,6 +1918,9 @@ fi
#
#
%changelog
+* Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org>
+- Enable CONFIG_SCSI_DH on s390x (rhbz 1586189)
+
* Tue Jun 05 2018 Jeremy Cline <jcline@redhat.com> - 4.16.14-300
- Linux v4.16.14