Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@suse.com>2019-09-25 15:29:08 +0300
committerDenis Kirjanov <dkirjanov@suse.com>2019-09-25 15:29:08 +0300
commit92f27e76ee3450c3905909aa0c6d903c8b3c9405 (patch)
tree4eab0a0c4e50f8c6212086db9b052f8f1b832686
parent8b1f909bc529e495045d5c89483f3c72ea1ba9c7 (diff)
parentb395237fb378ac1d7f5f8789ed09b4252eb4b2dd (diff)
Merge 'users/msuchanek/SLE12-SP5/for-next' into SLE12-SP5
Pull config updates from Michal Suchanek
-rw-r--r--config/s390x/default3
-rw-r--r--supported.conf1
2 files changed, 3 insertions, 1 deletions
diff --git a/config/s390x/default b/config/s390x/default
index ec573be8a4..ba0d9a376e 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -614,6 +614,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_CHSC_SCH=m
CONFIG_SCM_BUS=y
CONFIG_EADM_SCH=m
+CONFIG_VFIO_CCW=m
CONFIG_VFIO_AP=m
#
@@ -2456,7 +2457,7 @@ CONFIG_IOMMU_SUPPORT=y
#
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
CONFIG_S390_IOMMU=y
-# CONFIG_S390_CCW_IOMMU is not set
+CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_AP_IOMMU=y
#
diff --git a/supported.conf b/supported.conf
index 60a9623fa6..ef9de9fb23 100644
--- a/supported.conf
+++ b/supported.conf
@@ -2094,6 +2094,7 @@
drivers/s390/cio/chsc_sch
drivers/s390/cio/eadm_sch
drivers/s390/cio/qdio
++external drivers/s390/cio/vfio_ccw
drivers/s390/crypto/ap
drivers/s390/crypto/vfio_ap
drivers/s390/crypto/zcrypt_api