From patchwork Fri May 31 15:59:05 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: 1108422 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 45FpzY1Fckz9s4V; Sat, 1 Jun 2019 01:59:21 +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 1hWjw5-000255-Kz; Fri, 31 May 2019 15:59:17 +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 1hWjw4-00024e-1I for kernel-team@lists.ubuntu.com; Fri, 31 May 2019 15:59:16 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hWjw3-00013Q-Kx for kernel-team@lists.ubuntu.com; Fri, 31 May 2019 15:59:15 +0000 Received: by mail-qk1-f197.google.com with SMTP id n190so8271537qkd.5 for ; Fri, 31 May 2019 08:59:15 -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=5XrB4GtQx7zCitNEDSmbIc/MSkXRON3wRry+0eCMaBo=; b=RGrzlZ+4i+g26pRPLeSOK93zY0ZnwdUwXMfbFdZCUB+UKpZcKziEkMAIbXx1hTzjpT hmB8pdXz/16FEEPl2giL2G+rzdNgbu780qRrDYcXZKwj/gUW39CyTqobgvsa+tXYxcLp 7f/4LDBSKRhm/EBDmxNCqDb5/8iepwlcuhy0cVmedVBrN27am6lhjgmLsAqfEmJyntys aC4IJIhViYw1oqjOa5/vpV61NP2J9kS3TahLjvQdP7YfJ4du+OwvftcOujVY/TQWn9Eb 8bHkPscxDcykHvUu3w2Yp3HLH2mo59/bFtjTTTUPiZOuqwNfVLHgSnXnYBxHhfBXTX2x udjA== X-Gm-Message-State: APjAAAU7UzTs4NXSyz8v5ropB0zrxmqK1mp+XUzKd5pA4osoE2klKYxg qb9ROE9ki8Oe6auFc0uwpbzFLUcVYFmIs5KToti1fmXCLp8i7oAz5dAx39SqzVGje32wj+iWBbs ZYb3IZVGSaHoaBgd1+XtT7df3yUHRFNGBANDJh84L X-Received: by 2002:ac8:2fa8:: with SMTP id l37mr9679481qta.358.1559318354351; Fri, 31 May 2019 08:59:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxy86OSfcgu1p0PDWFcHveYUG4j0NFJo+RtOW7YmPocuvt+biZZxBpUw4SDzdd3JucrXGchA== X-Received: by 2002:ac8:2fa8:: with SMTP id l37mr9679457qta.358.1559318354090; Fri, 31 May 2019 08:59:14 -0700 (PDT) Received: from gallifrey.lan ([2804:14c:4e3:4a76:91e0:c4e3:a795:446d]) by smtp.gmail.com with ESMTPSA id z20sm4227331qtz.34.2019.05.31.08.59.12 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 31 May 2019 08:59:13 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [d/azure][PATCH 2/2] UBUNTU: [Config] linux-azure: CONFIG_CATAPULT_PCI=m Date: Fri, 31 May 2019 12:59:05 -0300 Message-Id: <20190531155905.29036-3-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190531155905.29036-1-marcelo.cerri@canonical.com> References: <20190531155905.29036-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/1824879 Signed-off-by: Marcelo Henrique Cerri --- debian.azure/config/annotations | 3 +++ debian.azure/config/config.common.ubuntu | 1 + debian.azure/control.d/azure.inclusion-list | 1 + 3 files changed, 5 insertions(+) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 9b979c987e4b..3c8c16421f5e 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -37,6 +37,9 @@ CONFIG_NO_HZ_IDLE note mark CONFIG_HOTPLUG_CPU note mark +CONFIG_CATAPULT_PCI policy<{'amd64': 'm'}> +CONFIG_CATAPULT_PCI mark note + CONFIG_HYPERV policy<{'amd64': 'y'}> CONFIG_HYPERV mark note diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 3e12df2a0974..b448bf381b8d 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -590,6 +590,7 @@ CONFIG_CAN_SLCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CARDBUS=y +CONFIG_CATAPULT_PCI=m # CONFIG_CB710_CORE is not set CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_KASAN_GENERIC=y diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list index bdce9eff42e1..cb0569fccd6c 100644 --- a/debian.azure/control.d/azure.inclusion-list +++ b/debian.azure/control.d/azure.inclusion-list @@ -30,6 +30,7 @@ drivers/block/nbd.ko drivers/block/rbd.ko drivers/block/virtio_blk.ko drivers/block/xen-blkfront.ko +drivers/catapult/catapult.ko drivers/char/hangcheck-timer.ko drivers/char/hw_random/powernv-rng.ko drivers/char/hw_random/virtio-rng.ko