From patchwork Fri Jun 28 21:32:49 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: 1124537 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 45b93m5D8mz9s8m; Sat, 29 Jun 2019 07:33:08 +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 1hgyUS-0000Sf-Ck; Fri, 28 Jun 2019 21:33:04 +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 1hgyUQ-0000RS-8d for kernel-team@lists.ubuntu.com; Fri, 28 Jun 2019 21:33:02 +0000 Received: from mail-qk1-f199.google.com ([209.85.222.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hgyUP-0007oo-Pd for kernel-team@lists.ubuntu.com; Fri, 28 Jun 2019 21:33:01 +0000 Received: by mail-qk1-f199.google.com with SMTP id v80so7879870qkb.19 for ; Fri, 28 Jun 2019 14:33:01 -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=SEg/DrglKTBZL+ycRn54tbjhCVIvzPLgR/k94CrR3to=; b=ESZ+QkU/OJ5ezebQsG0x+oEs3WQPChcTrCMDJKPS5v+xawniBPtu/8DsP+sTfY1Ujs O5lrJpedBfpL14DwrrdiafxLpVWA5MOp9opX+bkwSIZVbxH+amdTCIL5X7mbdrOvvMVi bjO5oYI5sLFy8WuMl2SoMARlm7+S5nkU1njiOvIF0JgZmAs0auPKfxIcN3gl4Ijl1isk ZvgSHMB0OCMwkLixvmg1U/Es2oHCx9J25nd9Cbnvn2QvYUXpf9lvgZ84o5HbD9AWD+P2 g8vyY92l1GBADpGkuZyJHnayeqduVvTi4Lo8pA9vJWEwZN4q4EF5gfcadmgYu6HNqehs bokw== X-Gm-Message-State: APjAAAXDYgzAaJ9SoM37jQPyLp8MvQHOVQuQLXYx3yZqCd7NHlvbV74U SVzNxP+PB/Dvb9vIf5yc9+tVBbLyxDIK5B/R90BLHxBJnTOLBZk3V/vA3WRghhM2x1UFN7G9VSl 4Kl739wWNE+okqdoQXVkE20n2emU2YG24EiZ+zY/n X-Received: by 2002:a37:640f:: with SMTP id y15mr9525594qkb.79.1561757580586; Fri, 28 Jun 2019 14:33:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqw2T26iaPKVgDdaBY0osea4wsHufzdLoNgkK4u/KN0f8+m3T97Ph/n1nu80sDxjkKpWMg2Htg== X-Received: by 2002:a37:640f:: with SMTP id y15mr9525575qkb.79.1561757580319; Fri, 28 Jun 2019 14:33:00 -0700 (PDT) Received: from gallifrey.lan ([2804:14c:4e3:4a76:c10f:28dc:7d4f:b72c]) by smtp.gmail.com with ESMTPSA id s23sm1724572qtj.56.2019.06.28.14.32.58 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 14:32:59 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [d/azure][PATCH 3/3] Revert "UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m" Date: Fri, 28 Jun 2019 18:32:49 -0300 Message-Id: <20190628213249.28685-4-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190628213249.28685-1-marcelo.cerri@canonical.com> References: <20190628213249.28685-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/1834696 This reverts commit aea7b866d46e39aff11dcc598dc411d3a066794d. 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 8b1437ad2fe9..3c8c16421f5e 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 note +CONFIG_MLX4_INFINIBAND policy<{'amd64': 'y'}> +CONFIG_MLX4_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_MLX5_INFINIBAND policy<{'amd64': 'y'}> +CONFIG_MLX5_INFINIBAND mark note CONFIG_BLK_DEV_NVME policy<{'amd64': 'y'}> CONFIG_BLK_DEV_NVME mark note @@ -25,6 +19,12 @@ 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 733526a3dac7..b448bf381b8d 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=m +CONFIG_INFINIBAND=y 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=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 @@ -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=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="" @@ -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=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 @@ -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=m +CONFIG_MLX5_INFINIBAND=y CONFIG_MLX5_MPFS=y CONFIG_MLXFW=m CONFIG_MLXREG_HOTPLUG=m