From patchwork Tue Aug 7 14:12:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 954536 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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41lGgZ29k4z9s3x; Wed, 8 Aug 2018 00:12:42 +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 1fn2ix-00029S-Ij; Tue, 07 Aug 2018 14:12: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 1fn2iw-00029E-Kp for kernel-team@lists.ubuntu.com; Tue, 07 Aug 2018 14:12:34 +0000 Received: from mail-qt0-f200.google.com ([209.85.216.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fn2iw-0007DT-B5 for kernel-team@lists.ubuntu.com; Tue, 07 Aug 2018 14:12:34 +0000 Received: by mail-qt0-f200.google.com with SMTP id j11-v6so13621093qtp.0 for ; Tue, 07 Aug 2018 07:12:34 -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; bh=XXa54QeFqVra0KiAaVxXRkUSMIBozRX8a0O5H7KJmuc=; b=gSq2s8v7vgZ7ZPyT737VxbUod64RtXoCfFNdkT00+HTElTVQq7ss6y0YSpf4eFH5cI cXw+AJ93tlUbOyu7vQj4nxKWFBeTSTQGiriail91jPwx/aL31A+eA54Ycq7qAoBbwAPd LfpfW+La/zFjPbLJREoEGwpONu1DK7Y3iT+Zh8LVylw3F1RxiGlpkfvSfaJGx+ggszJh 5Z3sef+vG3LGg585BREsUEDA8JNkjsuy0HmbV0MTqv3H0y8lGemTdXKZ2Y/Re+HK58PI p82ol6EetEK1Enlwjivx9EVvyQitv06UMgN0FG3G/6DipoKUOR+kSUttHg10rDscTpfu RfSQ== X-Gm-Message-State: AOUpUlECyiaO0JJiuo2kWblwSdfFzadF7Eox8tpkVscsv5GW6pRIcDR6 AvkVZNu8eXusA1/iBenHFTX539EBiLHDpbdXjD/KzNAcjbBpsoT5goNfM/fySwmAz0tYtlwv8vN 7XiBDIRNomnuWTr4n9KiVYcSNRwGVuvHesd+Iu6nP X-Received: by 2002:ac8:3969:: with SMTP id t38-v6mr19260898qtb.331.1533651153065; Tue, 07 Aug 2018 07:12:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcJM7/PubE9sNSEKbsd7m/DB4L2dvscqt/P+b61Vgdf3LAhKusg6fBWcY2yoFKZd2wuH0gpzA== X-Received: by 2002:ac8:3969:: with SMTP id t38-v6mr19260882qtb.331.1533651152840; Tue, 07 Aug 2018 07:12:32 -0700 (PDT) Received: from localhost.localdomain ([191.8.92.201]) by smtp.gmail.com with ESMTPSA id v57-v6sm872634qtc.75.2018.08.07.07.12.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Aug 2018 07:12:31 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic/azure][PATCH v2] UBUNTU: [Config] azure: Ensure CONFIG_MLX5_INFINIBAND=y Date: Tue, 7 Aug 2018 11:12:28 -0300 Message-Id: <20180807141228.15740-1-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1785822 Recent commit "infiniband: mlx5: fix build errors when INFINIBAND_USER_ACCESS=m" changed the Kconfig dependencies for CONFIG_MLX5_INFINIBAND, which caused it to revert to "m". Force CONFIG_INFINIBAND_USER_ACCESS=y, to keep CONFIG_MLX5_INFINIBAND=y, as requested by Bug #1759656. Also enforce CONFIG_MLX4_INFINIBAND and CONFIG_MLX5_INFINIBAND to "y" in the annotations file. Signed-off-by: Marcelo Henrique Cerri Acked-by: Stefan Bader Acked-by: Thadeu Lima de Souza Cascardo Acked-by: Andy Whitcroft --- debian.azure/config/annotations | 7 +++++-- debian.azure/config/config.common.ubuntu | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 7e353e930dac..b206dc21ca74 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -3070,8 +3070,8 @@ CONFIG_INFINIBAND_CXGB3 policy<{'amd64': 'm', 'arm64': ' CONFIG_INFINIBAND_CXGB3_DEBUG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}> CONFIG_INFINIBAND_CXGB4 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> CONFIG_INFINIBAND_I40IW policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> -CONFIG_MLX4_INFINIBAND policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> -CONFIG_MLX5_INFINIBAND policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> +CONFIG_MLX4_INFINIBAND policy<{'amd64': 'y'}> +CONFIG_MLX5_INFINIBAND policy<{'amd64': 'y'}> CONFIG_INFINIBAND_NES policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}> CONFIG_INFINIBAND_NES_DEBUG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}> CONFIG_INFINIBAND_OCRDMA policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}> @@ -3096,6 +3096,9 @@ CONFIG_SDMA_VERBOSITY policy<{'amd64': 'n'}> CONFIG_INFINIBAND_QEDR policy<{'amd64': 'm', 'arm64': 'm', 'ppc64el': 'm'}> CONFIG_INFINIBAND_BNXT_RE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}> +CONFIG_MLX4_INFINIBAND mark note +CONFIG_MLX5_INFINIBAND mark note + # Menu: Device Drivers >> Input device support # Menu: Device Drivers >> Input device support >> Generic input layer (needed for keyboard, mouse, ...) diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 8ea51473f3dd..a5230477f7a5 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -1971,7 +1971,7 @@ 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_ACCESS=y # CONFIG_INFINIBAND_USER_MAD is not set CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_USNIC=m