From patchwork Fri May 6 19:15:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1627759 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=CktdaYNz; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kw0fb5Whjz9sFx for ; Sat, 7 May 2022 05:16:22 +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 1nn3Qy-00055H-Jh; Fri, 06 May 2022 19:16:12 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nn3Qu-000546-VC for kernel-team@lists.ubuntu.com; Fri, 06 May 2022 19:16:08 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B710D3F223 for ; Fri, 6 May 2022 19:16:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1651864568; bh=9ZWTS9iY7nOi6xS9aK1MqxSo9FpNZQa0Puqy75NHtAc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CktdaYNzoQ0APd/nK4aiiZ36csy+QRd8lnRVn+XGBEg3chKxlshOKQrvX3vFUQLIA VMX2m8nhN2s3sRnGcEzg7n7rCvXrGpKm/bo8eEaFRDkOFvn88uC5szdJYDL0lL+Ibm frEwQwh9iR4zu8R56V7EO0wBsqJy6Si8yAa+vDMBgS80abkjNdjeqwF+5+s3dLOBjR kNvjTMBFz6Z5AQa5I+Hed7Zz5UBuaA7KrKOUfqA++uSMwOtRosVuhRsWd98XugzCnC Rb7p+bw0MuBG/8qbxdVpPprKUASXmcR214Dv9+v2M2yb772zuCVc2ftLHuetlv1T07 XxmT6/cY84SIQ== Received: by mail-pj1-f69.google.com with SMTP id o7-20020a17090a0a0700b001d93c491131so6679994pjo.6 for ; Fri, 06 May 2022 12:16:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9ZWTS9iY7nOi6xS9aK1MqxSo9FpNZQa0Puqy75NHtAc=; b=pQGUYm9fxk3OV0CRdJACOIi0mX0npeRHzToHknZThC1ZbHvh2zg3JAbcENFGDLAAMY av0X38YLdVBErKph4S7O++Wlv1pVI2KFYh77AdjsFcJZj40oeQ0O08QDwwZcWmVWH2uO 95v68HJ3pATQidJLvpYhCN+CzOQ38REnCzNBRLfVqGexS2wiQNKfJv1qVcahA3sqUMYE HfUQ3ecsfe8FD2prAI3Evp1VQp5nJGrNMFU8Nc24SCDzoQuFywUmSO2VtZQzSGJqPqa6 f4u+rLucBkQAEaQK32lhDVmRa3Qg+yK1xvWHj+ObwhjdTsWxA1TeQrQbpSuhngdBHVu7 XTSg== X-Gm-Message-State: AOAM533r/PSXO0sThdKzruBiPibYHaHYzjfmf0cTKDaEDULcMTjosjsm 54mXTNs4eoSnQjf+WrY0xAGFpNCM4Dq2XJsw372TpfAIB3pZEbSSfDwpqyXslpCwZOH0lrJymii kDbBpVoTCH8HUP9hdS31qEx/ObKxrvbfokvYaRN1fLw== X-Received: by 2002:a17:90a:e7ca:b0:1dc:4aeb:be5d with SMTP id kb10-20020a17090ae7ca00b001dc4aebbe5dmr5712531pjb.185.1651864567103; Fri, 06 May 2022 12:16:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwgbQ4R+wAdKm8tloCLcg2k4GeabH/nUM9bGOgqeM3wcb/Or7oOU4NOz0Omgbcj8rDxEJWjQ== X-Received: by 2002:a17:90a:e7ca:b0:1dc:4aeb:be5d with SMTP id kb10-20020a17090ae7ca00b001dc4aebbe5dmr5712499pjb.185.1651864566720; Fri, 06 May 2022 12:16:06 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id s13-20020a170902988d00b0015ed19cbfd8sm2125437plp.150.2022.05.06.12.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 12:16:05 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] azure: CONFIG_BLK_DEV_FD=n Date: Fri, 6 May 2022 13:15:58 -0600 Message-Id: <20220506191558.31245-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220506191558.31245-1-tim.gardner@canonical.com> References: <20220506191558.31245-1-tim.gardner@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: https://bugs.launchpad.net/bugs/1972017 Signed-off-by: Tim Gardner --- debian.azure/abi/amd64/azure.modules | 1 - debian.azure/config/annotations | 3 +++ debian.azure/config/config.common.ubuntu | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian.azure/abi/amd64/azure.modules b/debian.azure/abi/amd64/azure.modules index 16fa9bd7afe1..b886fbad18e7 100644 --- a/debian.azure/abi/amd64/azure.modules +++ b/debian.azure/abi/amd64/azure.modules @@ -647,7 +647,6 @@ firmware_attributes_class fit2 fit3 fixed -floppy fm10k fmvj18x_cs fore_200e diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 1de423392ad3..140617cef6ab 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -4,6 +4,9 @@ include "../../debian.master/config/annotations" +CONFIG_BLK_DEV_FD policy<{'amd64': 'n'}> +CONFIG_BLK_DEV_FD mark note + CONFIG_HIBERNATION policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_HIBERNATION mark note diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 7adf6d2192c6..ca25a1d05394 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -779,7 +779,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DRBD=m -CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY_T10=y