From c73f8400734f0d56c65cfb51edeb40d5ef2a9387 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Fri, 18 Aug 2017 08:12:49 -0500 Subject: [PATCH] UBUNTU: [Config] CONFIG_BLK_DEV_NVME=m for s390 BugLink: http://bugs.launchpad.net/bugs/1708432 Signed-off-by: Seth Forshee --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/s390x/config.common.s390x | 1 - 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 5963e49687ad..6b122e2d3946 100644 --- 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 14d4ba101c1f..22f889afd25d 100644 --- 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 482adacc1d37..525b5d8fd018 100644 --- 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 8fa46c620259..28ca015af23f 100644 --- 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 ade5023fedfb..c961bc9d9185 100644 --- 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 8adf7cdb33d4..1867ef828422 100644 --- 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 527566889237..f29f67113692 100644 --- 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 b0c075974bd6..00438de668ad 100644 --- 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 -- 2.39.5