Message ID | 20221027084203.75281-10-paolo.pisati@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=<UNKNOWN>) Authentication-Results: legolas.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=CmtLyB5M; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MyfLv2C0Qz23kY for <incoming@patchwork.ozlabs.org>; Thu, 27 Oct 2022 19:42:31 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1onySw-000690-UF; Thu, 27 Oct 2022 08:42:18 +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 <paolo.pisati@canonical.com>) id 1onySt-00063s-8c for kernel-team@lists.ubuntu.com; Thu, 27 Oct 2022 08:42:15 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (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 BA6D6412D2 for <kernel-team@lists.ubuntu.com>; Thu, 27 Oct 2022 08:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1666860134; bh=I5PXii4gsl3BtBtL2kKIDtAcP9kE+CxxtSX5D2auWfU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CmtLyB5MW5G+fQoes4Tiiz8R6YMk+2C/zuC+nFvDOtV9eSruDtshWu2bRndMeSPAZ oCEUcjyqbzDNoiKVeSJhtDE74qFBTbSgOtJUOba34N0a9/Xcm9jY+tQ8OtNjBJtxfP /VU5DZBF7AfhReRgMyMC0bjEyKz4yTVZ5qaVQ+M9gplqts3eSJ0heBL6ODndNgvO+2 fsLRA80/TbS4mfYzDpAOYKq5sQjqEH54p6GBNmcSAnyQYdlxUz5j7bHRsTO0Vy216a GMbRraPqlQ9TwIOZtxVOXA5Lbioa4KHljXEfLdgx07FA73wUcGPrvZF+IrFjePJQg/ 0oGwZySRyDOdw== Received: by mail-wr1-f72.google.com with SMTP id i14-20020adfa50e000000b0023652707418so154720wrb.20 for <kernel-team@lists.ubuntu.com>; Thu, 27 Oct 2022 01:42:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I5PXii4gsl3BtBtL2kKIDtAcP9kE+CxxtSX5D2auWfU=; b=ZqwIIljl6Tw4pIV08BB8zb1B0Ah3ueXrsFcL+CKqx/YwPJrDhZwkCeJB0PkCVrObgE vUTRRa9F3mYiZbSyv/vPEKZGm9XCHwSYZPNV8yNgZK7jdGNWCpMbDVIGqrYpK2xqG2pp nshdVD6PW0m1UqhyYnLPk9fjp6PDqmkARv/0zZbPLQQQOrd2e9R7a06sbAkdt+ShTQIg 7BVjwVvIVxsEJ7OlwHd9Kq8LshRMBuBoteYwSB1Gn1fOjV1P6jQPqxfRT1tom3pedeqU o1/LdfZsFYkkVtVOCqCgMxHO0e6+KbBwlPZjFs1y0gEexX80PSdWWsp1YDdai6Ihzeh5 3SeQ== X-Gm-Message-State: ACrzQf1jpDYRlNwHQgJ69BcDeC8e0Y4uL/oeQh9Qm1IOLCCB9yc0Jz+x IViW9qC8EgttPSuJLx3leGH8GX5iANDWeHgjnS/G5/9PBza91HIfygSToTSUarynrTpBcH9p+CF AhWcsfc4u6jaq3SkP0B+mysoW5ax+UwooIh1dJONMEw== X-Received: by 2002:a05:600c:1549:b0:3ce:794f:d801 with SMTP id f9-20020a05600c154900b003ce794fd801mr5038643wmg.63.1666860134257; Thu, 27 Oct 2022 01:42:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6jHqtTgvlEUtMVWm58BCZM8Knk7jGt1+2ZV5t+EjlkanypDgpOBa8LSuTgc6TR6AXb7N4Cbg== X-Received: by 2002:a05:600c:1549:b0:3ce:794f:d801 with SMTP id f9-20020a05600c154900b003ce794fd801mr5038631wmg.63.1666860133975; Thu, 27 Oct 2022 01:42:13 -0700 (PDT) Received: from canonical.com (net-93-65-52-3.cust.vodafonedsl.it. [93.65.52.3]) by smtp.gmail.com with ESMTPSA id h9-20020a05600c314900b003c6f3e5ba42sm4346053wmo.46.2022.10.27.01.42.13 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 01:42:13 -0700 (PDT) From: Paolo Pisati <paolo.pisati@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH 09/14] UBUNTU: annotations: fix up options built as module in master but disabled in kvm Date: Thu, 27 Oct 2022 10:41:58 +0200 Message-Id: <20221027084203.75281-10-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027084203.75281-1-paolo.pisati@canonical.com> References: <20221027084203.75281-1-paolo.pisati@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 <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
Use annotations from debian.master
|
expand
|
diff --git a/debian.kvm/config/annotations b/debian.kvm/config/annotations index c323ff347fcc..83d4c084c82d 100644 --- a/debian.kvm/config/annotations +++ b/debian.kvm/config/annotations @@ -81,3 +81,7 @@ CONFIG_HIBERNATION policy<{'amd64': 'n'}> CONFIG_ACCESSIBILITY policy<{'amd64': 'n'}> CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE policy<{'amd64': 'n'}> CONFIG_NETWORK_PHY_TIMESTAMPING policy<{'amd64': 'n'}> + +CONFIG_NVRAM policy<{'amd64': 'n'}> +CONFIG_BLK_DEV_NVME policy<{'amd64': 'n'}> +CONFIG_SOUNDWIRE policy<{'amd64': 'n'}>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.kvm/config/annotations | 4 ++++ 1 file changed, 4 insertions(+)