[bionic:linux-azure-4.15][PATCH 1/1] UBUNTU: [Config] azure: CONFIG_PCI_HYPERV=y

[Marcelo Henrique Cerri]

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

Set CONFIG_PCI_HYPERV as built-in to allow instances to boot directly
from NVME disks.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 debian.azure-4.15/abi/4.15.0-1104.116/amd64/azure.modules | 1 -
 debian.azure-4.15/config/annotations                      | 5 ++++-
 debian.azure-4.15/config/config.common.ubuntu             | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian.azure-4.15/abi/4.15.0-1104.116/amd64/azure.modules b/debian.azure-4.15/abi/4.15.0-1104.116/amd64/azure.modules
index 5ca80cef19f8..d84e7f9a41f9 100644
--- a/debian.azure-4.15/abi/4.15.0-1104.116/amd64/azure.modules
+++ b/debian.azure-4.15/abi/4.15.0-1104.116/amd64/azure.modules
@@ -1267,7 +1267,6 @@ pcf50633
 pcf50633-adc
 pcf50633-gpio
 pcf8591
-pci-hyperv
 pci-stub
 pci200syn
 pcips2
diff --git a/debian.azure-4.15/config/annotations b/debian.azure-4.15/config/annotations
index 9994ebc6430b..91854a8fd282 100644
--- a/debian.azure-4.15/config/annotations
+++ b/debian.azure-4.15/config/annotations
@@ -23,7 +23,10 @@ CONFIG_INFINIBAND_IPOIB                            policy<{'amd64': 'm'}>
 CONFIG_INFINIBAND_IPOIB                            mark<ENFORCED> note<LP:#1837397>
 
 CONFIG_BLK_DEV_NVME                                policy<{'amd64': 'y'}>
-CONFIG_BLK_DEV_NVME                                mark<ENFORCED> note<LP:#1793386>
+CONFIG_BLK_DEV_NVME                                mark<ENFORCED> note<LP:#1793386> note<LP:#1908571>
+
+CONFIG_PCI_HYPERV                                  policy<{'amd64': 'y'}>
+CONFIG_PCI_HYPERV                                  mark<ENFORCED> note<LP:#1908571>
 
 CONFIG_EDAC_DECODE_MCE                             policy<{'amd64': 'y'}>
 CONFIG_EDAC_DECODE_MCE                             mark<ENFORCED> note<LP:#1793386>
diff --git a/debian.azure-4.15/config/config.common.ubuntu b/debian.azure-4.15/config/config.common.ubuntu
index 59133ea5a1e9..48693eb5ec48 100644
--- a/debian.azure-4.15/config/config.common.ubuntu
+++ b/debian.azure-4.15/config/config.common.ubuntu
@@ -3506,7 +3506,7 @@ CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_PCI_EPF_TEST is not set
-CONFIG_PCI_HYPERV=m
+CONFIG_PCI_HYPERV=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
-- 
2.25.1