From patchwork Fri Jun 7 19:26:21 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: 1112197 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 45LCFW48kyz9sCJ; Sat, 8 Jun 2019 05:26:39 +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 1hZKVX-00068f-OJ; Fri, 07 Jun 2019 19:26:35 +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 1hZKVV-00067K-Sl for kernel-team@lists.ubuntu.com; Fri, 07 Jun 2019 19:26:33 +0000 Received: from mail-qt1-f198.google.com ([209.85.160.198]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hZKVV-0005we-Ep for kernel-team@lists.ubuntu.com; Fri, 07 Jun 2019 19:26:33 +0000 Received: by mail-qt1-f198.google.com with SMTP id e39so2724585qte.8 for ; Fri, 07 Jun 2019 12:26:33 -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=I5ODUIkITnygXwrwqGcc9E8jUTGuKp5XsLXKht6eflI=; b=UFHju4/dUFhh0J2UHaRNDkwSTvT3fH2nMl5Xlt/HkJuXK8+kH7Ms3xvRCGS04Qg+0h NIsEmd1lrqGqvRs0bPlBzLZIidAoeJtjbFOozV2XhknCef+OfqDl+ShRsZsv8+m/dKJK FXY5rgMkdHyU3b3WMIlfqunD+viG59PFWDSkdk+XoKDoXi9tQQPyriJQLkVxZjVgfrXt A6ZbgjzK5HYpvVo1dXqVerUfJhjZDG+gRknotONiKaZwnF7Psj5a+UbAZ5KrK0JLUUyz 2xMy+Bee8dsLSkDDQi1bbhoQZMaCq55qfcU6PGjBse222QSYcfN3+1dXpkog0GclCM50 8kbQ== X-Gm-Message-State: APjAAAX/gMI60dypxxdCe3kjk1HKvosHIDk4ytVuDuDfONbgR4/MmBlr cB3g3TlbFAizVCWSNc82UN5s7/rFINUpGij5qxfSEsz0eUT/NWioFG+KA+eF8nVy3wrTWOvVP1B U1ZbHAtoU9Y8n80TSV0e0cMpFnEosQWI+M+Ro/Yzf X-Received: by 2002:a0c:ad46:: with SMTP id v6mr45456458qvc.82.1559935592204; Fri, 07 Jun 2019 12:26:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqz6HFLWbCjaV79yk9cmd0N4b42aAA9/Mg8UDdjQXa83d3hxFNPDHNDqDpXDQjHeEuiRHjAXHA== X-Received: by 2002:a0c:ad46:: with SMTP id v6mr45456445qvc.82.1559935591893; Fri, 07 Jun 2019 12:26:31 -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.30 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 07 Jun 2019 12:26:31 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [d/azure][PATCH] UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m Date: Fri, 7 Jun 2019 16:26:21 -0300 Message-Id: <20190607192621.15071-4-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 3c8c16421f5e..8b1437ad2fe9 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 @@ -19,12 +25,6 @@ CONFIG_EDAC_DECODE_MCE mark note CONFIG_EDAC_AMD64 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 b448bf381b8d..733526a3dac7 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -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