[c/azure][PATCH] UBUNTU: [Config] linux-azure: CONFIG_INFINIBAND_{USER_MAD, IPOIB, IPOIB_DEBUG}=y

[Marcelo Henrique Cerri]

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

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

diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 6dca31115591..9fef52b0e9df 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -3060,7 +3060,7 @@ CONFIG_SERIAL_IPOCTAL                           policy<{'amd64': 'm', 'arm64': '
 
 # Menu: Device Drivers >> InfiniBand support
 CONFIG_INFINIBAND                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_INFINIBAND_USER_MAD                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_INFINIBAND_USER_MAD                      policy<{'amd64': 'y'}>
 CONFIG_INFINIBAND_USER_ACCESS                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_INFINIBAND_EXP_USER_ACCESS               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_INFINIBAND_ON_DEMAND_PAGING              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -3082,9 +3082,9 @@ CONFIG_INFINIBAND_USNIC                         policy<{'amd64': 'm', 'i386': 'm
 CONFIG_INFINIBAND_HNS                           policy<{'arm64': 'm'}>
 CONFIG_INFINIBAND_HNS_HIP06                     policy<{'arm64': 'm'}>
 CONFIG_INFINIBAND_HNS_HIP08                     policy<{'arm64': 'm'}>
-CONFIG_INFINIBAND_IPOIB                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_INFINIBAND_IPOIB                         policy<{'amd64': 'y'}>
 CONFIG_INFINIBAND_IPOIB_CM                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_INFINIBAND_IPOIB_DEBUG                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_INFINIBAND_IPOIB_DEBUG                   policy<{'amd64': 'y'}>
 CONFIG_INFINIBAND_SRP                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_INFINIBAND_SRPT                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_INFINIBAND_ISER                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
@@ -3100,6 +3100,9 @@ CONFIG_INFINIBAND_BNXT_RE                       policy<{'amd64': 'm', 'arm64': '
 #
 CONFIG_MLX4_INFINIBAND                          mark<ENFORCED> note<LP:1759656>
 CONFIG_MLX5_INFINIBAND                          mark<ENFORCED> note<LP:1759656>
+CONFIG_INFINIBAND_USER_MAD                      note<LP:1818141> note<LP:1798185> mark<ENFORCED>
+CONFIG_INFINIBAND_IPOIB                         note<LP:1818141> note<LP:1798185> mark<ENFORCED>
+CONFIG_INFINIBAND_IPOIB_DEBUG                   note<LP:1818141> note<LP:1798185> mark<ENFORCED>
 
 # Menu: Device Drivers >> Input device support
 
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index f38dcc42fc9d..e3950da6a264 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -1981,7 +1981,10 @@ 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 is not set
+CONFIG_INFINIBAND_IPOIB=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_ISERT=m
 CONFIG_INFINIBAND_MTHCA=m
@@ -1995,7 +1998,7 @@ CONFIG_INFINIBAND_OPA_VNIC=m
 CONFIG_INFINIBAND_SRP=m
 # CONFIG_INFINIBAND_SRPT is not set
 CONFIG_INFINIBAND_USER_ACCESS=y
-# CONFIG_INFINIBAND_USER_MAD is not set
+CONFIG_INFINIBAND_USER_MAD=y
 CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_USNIC=m
 CONFIG_INITRAMFS_SOURCE=""
@@ -4541,6 +4544,7 @@ CONFIG_TIGON3_HWMON=y
 CONFIG_TIMERFD=y
 CONFIG_TIPC=m
 CONFIG_TIPC_DIAG=m
+# CONFIG_TIPC_MEDIA_IB is not set
 CONFIG_TIPC_MEDIA_UDP=y
 # CONFIG_TI_ST is not set
 CONFIG_TLS=m
-- 
2.17.1