[bionic/linux-azure, cosmic/linux-azure][PATCH] UBUNTU: [Config] linux-azure: CONFIG_BLK_DEV_NVME=y

[Marcelo Henrique Cerri]

BugLink: http://bugs.launchpad.net/bugs/1793386

Also ensure that other related configs are set to the correct value.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 debian.azure/config/annotations          | 6 +++++-
 debian.azure/config/config.common.ubuntu | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index f32212c574ea..eb498962c93c 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -1259,7 +1259,7 @@ CONFIG_OF_UNITTEST                              flag<DEBUG>
 CONFIG_EDAC                                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_EDAC_LEGACY_SYSFS                        policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_EDAC_DEBUG                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
-CONFIG_EDAC_DECODE_MCE                          policy<{'amd64': 'm', 'i386': 'm'}>
+CONFIG_EDAC_DECODE_MCE                          policy<{'amd64': 'y'}>
 CONFIG_EDAC_GHES                                policy<{'amd64': 'n', 'arm64': 'n', 'i386': 'n'}>
 CONFIG_EDAC_AMD64                               policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_EDAC_AMD64_ERROR_INJECTION               policy<{'amd64': 'n', 'i386': 'n'}>
@@ -1290,6 +1290,8 @@ CONFIG_EDAC_THUNDERX                            policy<{'arm64': 'm'}>
 CONFIG_EDAC_XGENE                               policy<{'arm64': 'm'}>
 #
 CONFIG_EDAC_GHES                                flag<REVIEW> note<LP:1714112 enable once fix is available>
+CONFIG_EDAC_DECODE_MCE                          mark<ENFORCED> note<LP:#1793386>
+CONFIG_EDAC_AMD64                               mark<ENFORCED> note<LP:#1793386>
 
 # Menu: Device Drivers >> EDAC (Error Detection And Correction) reporting >> Altera SOCFPGA ECC
 
@@ -4751,6 +4753,8 @@ CONFIG_BLK_DEV_NVME                             policy<{'amd64': 'y', 'arm64': '
 CONFIG_NVME_MULTIPATH                           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'}>
+#
+CONFIG_BLK_DEV_NVME                             mark<ENFORCED> note<LP:#1793386>
 
 # Menu: Device Drivers >> NVME Support >> NVMe Target support
 CONFIG_NVME_TARGET                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index f556326b25cc..0c7f6f8b9686 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -435,7 +435,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_NULL_BLK is not set
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_BLK_DEV_NVME=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_BLK_DEV_PMEM=y
 CONFIG_BLK_DEV_RAM=m
@@ -3290,7 +3290,7 @@ CONFIG_NVDIMM_DAX=y
 CONFIG_NVDIMM_PFN=y
 # CONFIG_NVM is not set
 CONFIG_NVMEM=y
-CONFIG_NVME_CORE=m
+CONFIG_NVME_CORE=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_MULTIPATH=y
-- 
2.17.1