@@ -4,11 +4,17 @@
include "../../debian.master/config/annotations"
-CONFIG_MLX4_INFINIBAND policy<{'amd64': 'y'}>
-CONFIG_MLX4_INFINIBAND mark<ENFORCED> note<LP:#1759656>
+CONFIG_MLX4_INFINIBAND policy<{'amd64': 'm'}>
+CONFIG_MLX4_INFINIBAND mark<ENFORCED> note<LP:#1827916>
-CONFIG_MLX5_INFINIBAND policy<{'amd64': 'y'}>
-CONFIG_MLX5_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_BLK_DEV_NVME policy<{'amd64': 'y'}>
CONFIG_BLK_DEV_NVME mark<ENFORCED> note<LP:#1793386>
@@ -19,12 +25,6 @@ CONFIG_EDAC_DECODE_MCE mark<ENFORCED> note<LP:#17933
CONFIG_EDAC_AMD64 policy<{'amd64': 'm'}>
CONFIG_EDAC_AMD64 mark<ENFORCED> note<LP:#1793386>
-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>
@@ -2038,7 +2038,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=y
+CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
# CONFIG_INFINIBAND_BNXT_RE is not set
@@ -2046,7 +2046,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=y
+CONFIG_INFINIBAND_IPOIB=m
# CONFIG_INFINIBAND_IPOIB_CM is not set
CONFIG_INFINIBAND_IPOIB_DEBUG=y
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
@@ -2062,8 +2062,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=y
-CONFIG_INFINIBAND_USER_MAD=y
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MAD=m
CONFIG_INFINIBAND_USER_MEM=y
CONFIG_INFINIBAND_USNIC=m
CONFIG_INITRAMFS_SOURCE=""
@@ -2756,12 +2756,12 @@ CONFIG_MISC_RTSX=m
CONFIG_MISC_RTSX_PCI=m
# CONFIG_MK8 is not set
# CONFIG_MKISS is not set
-CONFIG_MLX4_CORE=y
+CONFIG_MLX4_CORE=m
CONFIG_MLX4_CORE_GEN2=y
CONFIG_MLX4_DEBUG=y
CONFIG_MLX4_EN=m
CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_INFINIBAND=y
+CONFIG_MLX4_INFINIBAND=m
CONFIG_MLX5_ACCEL=y
CONFIG_MLX5_CORE=y
CONFIG_MLX5_CORE_EN=y
@@ -2772,7 +2772,7 @@ CONFIG_MLX5_EN_IPSEC=y
CONFIG_MLX5_EN_RXNFC=y
CONFIG_MLX5_ESWITCH=y
CONFIG_MLX5_FPGA=y
-CONFIG_MLX5_INFINIBAND=y
+CONFIG_MLX5_INFINIBAND=m
CONFIG_MLX5_MPFS=y
CONFIG_MLXFW=m
CONFIG_MLXREG_HOTPLUG=m
BugLink: http://bugs.launchpad.net/bugs/1827916 Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> --- debian.azure/config/annotations | 20 ++++++++++---------- debian.azure/config/config.common.ubuntu | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-)