[PATCH 1/1][B/gcp-4.15] UBUNTU: [config] gcp: enable BLK_DEV_NVME=y

[Khalid Elmously]

BugLink: https://bugs.launchpad.net/bugs/1927050

Fixed whitespace while in there

Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---
 debian.gcp-4.15/abi/4.15.0-1098.111/amd64/gcp.modules | 2 --
 debian.gcp-4.15/config/annotations                    | 7 +++++--
 debian.gcp-4.15/config/config.common.ubuntu           | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian.gcp-4.15/abi/4.15.0-1098.111/amd64/gcp.modules b/debian.gcp-4.15/abi/4.15.0-1098.111/amd64/gcp.modules
index 0aac8131db22c5..1340cc64eaf95f 100644
--- a/debian.gcp-4.15/abi/4.15.0-1098.111/amd64/gcp.modules
+++ b/debian.gcp-4.15/abi/4.15.0-1098.111/amd64/gcp.modules
@@ -2974,8 +2974,6 @@ null_blk
 nuvoton-cir
 nv_tco
 nvidiafb
-nvme
-nvme-core
 nvme-fabrics
 nvme-fc
 nvme-loop
diff --git a/debian.gcp-4.15/config/annotations b/debian.gcp-4.15/config/annotations
index e933c61cb473dd..932927c26480a6 100644
--- a/debian.gcp-4.15/config/annotations
+++ b/debian.gcp-4.15/config/annotations
@@ -82,11 +82,14 @@ CONFIG_NF_CONNTRACK_PROCFS                      flag<ENFORCE> note<initial packa
 CONFIG_NF_CT_NETLINK                            flag<ENFORCE> note<initial packaging>
 CONFIG_NF_CONNTRACK_PROCFS                      flag<DEPRECATED>
 
-CONFIG_ATARI_PARTITION                             policy<{'amd64': 'n'}>
-CONFIG_ATARI_PARTITION                             mark<ENFORCED> note<LP:1908264>
+CONFIG_ATARI_PARTITION                          policy<{'amd64': 'n'}>
+CONFIG_ATARI_PARTITION                          mark<ENFORCED> note<LP:1908264>
 
 CONFIG_LATENCYTOP                               policy<{'amd64': 'n'}>
 CONFIG_LATENCYTOP                               mark<ENFORCED> note<override master annotations>
 
 CONFIG_SPI_INTEL_SPI_PLATFORM                   policy<{'amd64': 'm'}>
 CONFIG_SPI_INTEL_SPI_PLATFORM                   mark<ENFORCED> note<override master annotations>
+
+CONFIG_BLK_DEV_NVME                             policy<{'amd64': 'y'}>
+CONFIG_BLK_DEV_NVME                             mark<ENFORCED> note<Needed for minimal images>
diff --git a/debian.gcp-4.15/config/config.common.ubuntu b/debian.gcp-4.15/config/config.common.ubuntu
index 4204d72d670e5a..fc7fb118e3dfa4 100644
--- a/debian.gcp-4.15/config/config.common.ubuntu
+++ b/debian.gcp-4.15/config/config.common.ubuntu
@@ -659,7 +659,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_NVME=y
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_BLK_DEV_RAM=m
@@ -4968,7 +4968,7 @@ CONFIG_NVDIMM_DAX=y
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVM=y
 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