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:00:26 -0400
commitdc16ce7d36f111450d683d352f78257338a98135 (patch)
treec7e002ebba6862aa2009af92073e5856b5e57a02
parent4ec5ad2daf45b9ef50a9af9527ccba4214c3bb96 (diff)
downloadkernel-dc16ce7d36f111450d683d352f78257338a98135.tar.gz
kernel-dc16ce7d36f111450d683d352f78257338a98135.tar.xz
kernel-dc16ce7d36f111450d683d352f78257338a98135.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 317cad3a8..452c337d6 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4319,8 +4319,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 4e1e43a96..3ea25e712 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4293,8 +4293,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 48521f810..92492302c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1852,6 +1852,9 @@ fi
#
#
%changelog
+* Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org>
+- Enable CONFIG_SCSI_DH on s390x (rhbz 1586189)
+
* Tue Jun 05 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git2.1
- Linux v4.17-1535-g5037be168f0e