[c/azure][PATCH 2/2] Revert "UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m"

[Marcelo Henrique Cerri]

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

This reverts commit 38589a5bc993b1f25ec89659ee3d9926ff19122a.

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

diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index a53e2d22a858..ca3d81e5a17d 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -4,17 +4,11 @@
 
 include "../../debian.master/config/annotations"
 
-CONFIG_MLX4_INFINIBAND                             policy<{'amd64': 'm'}>
-CONFIG_MLX4_INFINIBAND                             mark<ENFORCED> note<LP:#1827916>
+CONFIG_MLX4_INFINIBAND                             policy<{'amd64': 'y'}>
+CONFIG_MLX4_INFINIBAND                             mark<ENFORCED> note<LP:#1759656>
 
-CONFIG_MLX5_INFINIBAND                             policy<{'amd64': 'm'}>
-CONFIG_MLX5_INFINIBAND                             mark<ENFORCED> note<LP:#1827916>
-
-CONFIG_INFINIBAND_USER_MAD                         policy<{'amd64': 'm'}>
-CONFIG_INFINIBAND_USER_MAD                         mark<ENFORCED> note<LP:#1827916>
-
-CONFIG_INFINIBAND_IPOIB                            policy<{'amd64': 'm'}>
-CONFIG_INFINIBAND_IPOIB                            mark<ENFORCED> note<LP:#1827916>
+CONFIG_MLX5_INFINIBAND                             policy<{'amd64': 'y'}>
+CONFIG_MLX5_INFINIBAND                             mark<ENFORCED> note<LP:#1759656>
 
 CONFIG_BLK_DEV_NVME                                policy<{'amd64': 'y'}>
 CONFIG_BLK_DEV_NVME                                mark<ENFORCED> note<LP:#1793386>
@@ -49,6 +43,12 @@ CONFIG_IOSCHED_BFQ                                 policy<{'amd64': 'm'}>
 CONFIG_BFQ_GROUP_IOSCHED                           policy<{'amd64': 'y'}>
 CONFIG_BFQ_GROUP_IOSCHED                           mark<ENFORCED> note<LP:#1813211>
 
+CONFIG_INFINIBAND_USER_MAD                         policy<{'amd64': 'y'}>
+CONFIG_INFINIBAND_USER_MAD                         note<LP:#1818141> note<LP:#1798185> mark<ENFORCED>
+
+CONFIG_INFINIBAND_IPOIB                            policy<{'amd64': 'y'}>
+CONFIG_INFINIBAND_IPOIB                            note<LP:#1818141> note<LP:#1798185> mark<ENFORCED>
+
 CONFIG_INFINIBAND_IPOIB_DEBUG                      policy<{'amd64': 'y'}>
 CONFIG_INFINIBAND_IPOIB_DEBUG                      note<LP:#1818141> note<LP:#1798185> mark<ENFORCED>
 
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index a9a2e9c62a2d..014e52409c29 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -1983,7 +1983,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -1991,7 +1991,7 @@ CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
 # CONFIG_INFINIBAND_CXGB4 is not set
 # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
 # CONFIG_INFINIBAND_I40IW is not set
-CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB=y
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
@@ -2007,8 +2007,8 @@ CONFIG_INFINIBAND_OPA_VNIC=m
 # CONFIG_INFINIBAND_RDMAVT is not set
 CONFIG_INFINIBAND_SRP=m
 # CONFIG_INFINIBAND_SRPT is not set
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=y
+CONFIG_INFINIBAND_USER_MAD=y
 CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_USNIC=m
 CONFIG_INITRAMFS_SOURCE=""
@@ -2686,12 +2686,12 @@ CONFIG_MISC_RTSX=m
 CONFIG_MISC_RTSX_PCI=m
 # CONFIG_MK8 is not set
 # CONFIG_MKISS is not set
-CONFIG_MLX4_CORE=m
+CONFIG_MLX4_CORE=y
 CONFIG_MLX4_CORE_GEN2=y
 CONFIG_MLX4_DEBUG=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX4_INFINIBAND=y
 CONFIG_MLX5_ACCEL=y
 CONFIG_MLX5_CORE=y
 CONFIG_MLX5_CORE_EN=y
@@ -2700,7 +2700,7 @@ CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_EN_IPSEC=y
 CONFIG_MLX5_ESWITCH=y
 CONFIG_MLX5_FPGA=y
-CONFIG_MLX5_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=y
 CONFIG_MLX5_MPFS=y
 CONFIG_MLXFW=m
 CONFIG_MLXREG_HOTPLUG=m
-- 
2.20.1