From patchwork Fri Jun 7 19:26:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1112194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45LCFV1FBZz9sDB; Sat, 8 Jun 2019 05:26:38 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hZKVT-00066l-FK; Fri, 07 Jun 2019 19:26:31 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hZKVS-00066L-5m for kernel-team@lists.ubuntu.com; Fri, 07 Jun 2019 19:26:30 +0000 Received: from mail-qk1-f200.google.com ([209.85.222.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hZKVR-0005vt-Kd for kernel-team@lists.ubuntu.com; Fri, 07 Jun 2019 19:26:29 +0000 Received: by mail-qk1-f200.google.com with SMTP id l185so2446686qkd.14 for ; Fri, 07 Jun 2019 12:26:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PO4A16GRIB2r7GndQ691vnymWqqT8mJU5gqTRKtxg6c=; b=CdDZzxq+c1GMXT1twLMHb19GjWdiYaeR6I1I8qTm8wOW7Z36a4gmBHlgiYkg+N+I4z LkHVuz6srxfGsC1koHdpB4XdNtlYgBYNd86TQV1poukNlf+tNUsojce0TkxZbcngco7x N5iCQr6LgrPmemhKTnSrj7/tuFQLslzcFfLA+YE7run2xLwszJrsJYCAIU5hsXv3E6MM 3igBVACqgmrzNrKJm4Yr5Aj7FFwApzBt6eR3WQp0jPuRxdMpdHn7sRi/ysgZcLZGvXFy BYf4xax/hd7CEbz5VVW/hIdTK6RZJEgfLfaxBXTV6E6c6Z8Gp8vm8adWSE65+e2gdyaJ 6DaA== X-Gm-Message-State: APjAAAUSfgfZg2wFW9QXBU1VyFSg2LZ39CS0BS+Dk3D+9iAKnvYJMgOY aWf/tVoip9VeM0XTFBLaybLeJi+EGSbb6ZJYSNgUVIzNWuEmQeyIkg+zBckhvNSVwhFNSemZBfF LZQZGB0oqOyNHsm+EKD9FiuxZ2FEJVKY8i13oOAWS X-Received: by 2002:a37:490d:: with SMTP id w13mr28339556qka.179.1559935588348; Fri, 07 Jun 2019 12:26:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsit63A60BqFGhE7o8hiPjBegcD001GRcPU+VF2PxE8DZAPl+5PBF5MqX19f8NX1m5qhd2Xg== X-Received: by 2002:a37:490d:: with SMTP id w13mr28339549qka.179.1559935588078; Fri, 07 Jun 2019 12:26:28 -0700 (PDT) Received: from gallifrey.lan ([2804:14c:4e3:4a76:b1ae:211f:e30b:4e05]) by smtp.gmail.com with ESMTPSA id l2sm1340966qtp.14.2019.06.07.12.26.26 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 07 Jun 2019 12:26:27 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [x/azure][PATCH 1/1] UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m Date: Fri, 7 Jun 2019 16:26:19 -0300 Message-Id: <20190607192621.15071-2-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190607192621.15071-1-marcelo.cerri@canonical.com> References: <20190607192621.15071-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1827916 Signed-off-by: Marcelo Henrique Cerri --- 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 2d62714ba03d..be81887595fe 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -4,11 +4,17 @@ include "../../debian.master/config/annotations" -CONFIG_MLX4_INFINIBAND policy<{'amd64': 'y'}> -CONFIG_MLX4_INFINIBAND mark note +CONFIG_MLX4_INFINIBAND policy<{'amd64': 'm'}> +CONFIG_MLX4_INFINIBAND mark note -CONFIG_MLX5_INFINIBAND policy<{'amd64': 'y'}> -CONFIG_MLX5_INFINIBAND mark note +CONFIG_MLX5_INFINIBAND policy<{'amd64': 'm'}> +CONFIG_MLX5_INFINIBAND mark note + +CONFIG_INFINIBAND_USER_MAD policy<{'amd64': 'm'}> +CONFIG_INFINIBAND_USER_MAD mark note + +CONFIG_INFINIBAND_IPOIB policy<{'amd64': 'm'}> +CONFIG_INFINIBAND_IPOIB mark note CONFIG_BLK_DEV_NVME policy<{'amd64': 'y'}> CONFIG_BLK_DEV_NVME mark note @@ -43,12 +49,6 @@ CONFIG_IOSCHED_BFQ policy<{'amd64': 'm'}> CONFIG_BFQ_GROUP_IOSCHED policy<{'amd64': 'y'}> CONFIG_BFQ_GROUP_IOSCHED mark note -CONFIG_INFINIBAND_USER_MAD policy<{'amd64': 'y'}> -CONFIG_INFINIBAND_USER_MAD note note mark - -CONFIG_INFINIBAND_IPOIB policy<{'amd64': 'y'}> -CONFIG_INFINIBAND_IPOIB note note mark - CONFIG_INFINIBAND_IPOIB_DEBUG policy<{'amd64': 'y'}> CONFIG_INFINIBAND_IPOIB_DEBUG note note mark diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 2c7a8ec0791d..c1622f9c9fef 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -1965,7 +1965,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 @@ -1973,7 +1973,7 @@ CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y # CONFIG_INFINIBAND_CXGB4 is not set # CONFIG_INFINIBAND_EXP_USER_ACCESS 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 @@ -1989,8 +1989,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="" @@ -2678,12 +2678,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 @@ -2692,7 +2692,7 @@ CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_EN_IPSEC=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_MLXSW_CORE=m