@@ -3161,8 +3161,6 @@ null_blk
nuvoton-cir
nv_tco
nvidiafb
-nvme
-nvme-core
nvme-fabrics
nvme-fc
nvme-loop
@@ -99,3 +99,6 @@ CONFIG_SND_SOC_AMD_RENOIR policy<{'amd64': 'n'}>
CONFIG_SND_SOC_AMD_RENOIR note<Unnecessary for linux-gcp>
CONFIG_SND_SOC_AMD_RENOIR_MACH policy<{'amd64': 'n'}>
CONFIG_SND_SOC_AMD_RENOIR_MACH note<Unnecessary for linux-gcp>
+
+CONFIG_BLK_DEV_NVME policy<{'amd64': 'y'}>
+CONFIG_BLK_DEV_NVME mark<ENFORCED> note<Needed for minimal images>
@@ -687,7 +687,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
@@ -5360,7 +5360,7 @@ CONFIG_NVM=y
CONFIG_NVMEM=y
CONFIG_NVMEM_SPMI_SDAM=m
CONFIG_NVMEM_SYSFS=y
-CONFIG_NVME_CORE=m
+CONFIG_NVME_CORE=y
CONFIG_NVME_FABRICS=m
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
BugLink: https://bugs.launchpad.net/bugs/1927050 Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com> --- debian.gcp/abi/5.11.0-1005.5/amd64/gcp.modules | 2 -- debian.gcp/config/annotations | 3 +++ debian.gcp/config/config.common.ubuntu | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-)