UBUNTU: [Config] CONFIG_BLK_DEV_NVME=m for s390

BugLink: http://bugs.launchpad.net/bugs/1708432
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5963e49687ad24d89080d71905a5c01b04ee0a97..6b122e2d39467787eb81bd8fb2aaa97ac4263118 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -54,7 +54,6 @@ CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_RSXX=m
 CONFIG_BLK_DEV_SKD=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 14d4ba101c1f96fe9e5e1f34043a5a39de528cc4..22f889afd25d006f658c6e641c8b9801f499763a 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -490,7 +490,7 @@ CONFIG_CRYPTO_DRBG_HASH                         policy<{'amd64': 'y', 'arm64': '
 CONFIG_CRYPTO_DRBG_CTR                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 
 # Menu: Device Drivers
-CONFIG_BLK_DEV_NVME                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
+CONFIG_BLK_DEV_NVME                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BLK_DEV_NVME_SCSI                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NVME_RDMA                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NVME_FC                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 482adacc1d37a60665d5167c8fc915ba00e98950..525b5d8fd01833eb38877c8ae2075acd49682b08 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -61,7 +61,6 @@ CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_RSXX=m
 CONFIG_BLK_DEV_SKD=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 8fa46c62025915972710c1ba8834a3de1edda1b3..28ca015af23f2ac3b47d1eb7b28f6f017c8bd040 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -54,7 +54,6 @@ CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_RSXX=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ade5023fedfb7f534382a496c98b29f124f875a1..c961bc9d9185282fd5bfe5d6f58a5778a03daf7e 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -965,6 +965,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 8adf7cdb33d46e5369c3fc63152c1280986121d2..1867ef82842264eadfeceb73f419325eb7abbd1b 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -52,7 +52,6 @@ CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_RSXX=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 527566889237460dcb7d7c176ee9c8962166316a..f29f671136928abd4386faf763e0f2d28b95717e 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -52,7 +52,6 @@ CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_NVME=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_RSXX=m
 CONFIG_BLK_DEV_SKD=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index b0c075974bd61bac430ffd31a5c2ea0bd7c83aa7..00438de668adae95b53a3ac560f4e53da44f1526 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -39,7 +39,6 @@ CONFIG_AUTOFS4_FS=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_NVME is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_BLK_DEV_RSXX is not set
 # CONFIG_BLK_DEV_SKD is not set