From patchwork Mon Mar 15 21:44:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1453572 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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 ozlabs.org (Postfix) with ESMTPS id 4DzqhL1FL7z9sVt; Tue, 16 Mar 2021 08:44:48 +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 ) id 1lLv10-0002a7-QC; Mon, 15 Mar 2021 21:44:42 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lLv0z-0002Zr-NK for kernel-team@lists.ubuntu.com; Mon, 15 Mar 2021 21:44:41 +0000 Received: from mail-ot1-f69.google.com ([209.85.210.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lLv0z-0007gt-C3 for kernel-team@lists.ubuntu.com; Mon, 15 Mar 2021 21:44:41 +0000 Received: by mail-ot1-f69.google.com with SMTP id 97so20275002otm.11 for ; Mon, 15 Mar 2021 14:44:41 -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=HZW2CPqo/rbQJj8O3PRduAZxdplUpiWIFTe0mZBbTAQ=; b=UJVYu3uuKjnGP/dJnEbfA5xmubgiqeoAZaCfdcBCtd4NpYDsl71FMx7WT7ml0UpYio /I9oSeUBH1M0g55Q7/RwKTmAp1sHoWceiBOztzbIyP3kxgyqsYosFnvTaCxwrsinu2kE E7sZGsC3qFFEEUtn0sjyI5XzcS7JEixvFcU1n8r9fZDLiC4/vr5Jk8fWbqH1J+ujI6W7 ajZNPr73PBmdRBZpZqqYb2qEXKP2iuZcczmBIFBG2NolDOs6Z34CB2m2aSCUs2pAmmPN UWjO8wsrMbr5f5IWlOF2wwnSToiZfCFaRXpk1S2sGzzWYVNrlwcY1pvajibOWc1iVe1n YWKg== X-Gm-Message-State: AOAM532bbGdl9HrC8VHdYvDPg8CJpDEaUGoylvmz5xnnpdYLL35NumhD RQ9ouYhkXQvtFQyJiF6m0dvo97IxwIcOflJXH3BRYic2Xgk6gPVgrwZy4zQZ+KfRUa6NTxwlRZH Ooh4uajemaVvl+yuIHva63EQRlBYwD/qWID7mw4pQuw== X-Received: by 2002:a9d:1c8f:: with SMTP id l15mr859419ota.29.1615844680398; Mon, 15 Mar 2021 14:44:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyExtBBMGmXv3U7mAaUaXJdnyIZPvRr5V+sQ/FGr8qyjrqQ6ZEX6UT9pTMdajelm9T6O3pNwg== X-Received: by 2002:a9d:1c8f:: with SMTP id l15mr859410ota.29.1615844680168; Mon, 15 Mar 2021 14:44:40 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:61b6:c9e8:5219:a576]) by smtp.gmail.com with ESMTPSA id t9sm482634otk.27.2021.03.15.14.44.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 14:44:39 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3][X] UBUNTU: [Config] add arm64 to annotations arch list Date: Mon, 15 Mar 2021 16:44:29 -0500 Message-Id: <20210315214437.799781-2-seth.forshee@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315214437.799781-1-seth.forshee@canonical.com> References: <20210315214437.799781-1-seth.forshee@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" Properties: no-test-build Ignore: yes Signed-off-by: Seth Forshee --- debian.master/config/annotations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 68f4c169f538..c798030ca326 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1,6 +1,6 @@ # Menu: HEADER # FORMAT: 2 -# ARCH: x86 arm powerpc s390 +# ARCH: x86 arm arm64 powerpc s390 # Mark debugging symbols. # exceptions From patchwork Mon Mar 15 21:44:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1453573 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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 ozlabs.org (Postfix) with ESMTPS id 4Dzqhl2XnQz9sW1; Tue, 16 Mar 2021 08:45:11 +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 ) id 1lLv1Q-0002hn-J1; Mon, 15 Mar 2021 21:45:08 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lLv17-0002c9-Jc for kernel-team@lists.ubuntu.com; Mon, 15 Mar 2021 21:44:49 +0000 Received: from mail-oi1-f199.google.com ([209.85.167.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lLv17-0007hQ-8D for kernel-team@lists.ubuntu.com; Mon, 15 Mar 2021 21:44:49 +0000 Received: by mail-oi1-f199.google.com with SMTP id f80so3146820oig.13 for ; Mon, 15 Mar 2021 14:44:49 -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=KyA/HW/OrQdagfvOhLc0Qhb5BKMT76zRr0UIC5q/OYA=; b=MPES9YKBE11YSJvxQK8r6BAQUuLnU/jamlOc6C6OV7NZhYxg9PCaO6JWAn6IyChBTW ut93fi0Vo+8SQ+dkCIzXg52y2MAlxZR4zezioGAD/1guqfe8vOg2Y+4diA2Dq1QQkU8i QdLeO+6ZTheYuD2ytq5Qz5ewS6Ed/U5/xS5rigWe4AJxPv2Tz8Pd8KUkHNDignfnRtB0 wiEm0AMiFAyK8wBue8WdhuEInaRQ98fSJ8/OohsaUHTuK3o0+oOMLaWSIx7roTiwD0nx XE3c4II58y7WjKFjL1pBDJGkx/K8Wfe0ODZ3tKrcaXlFXf73IUy7krfbwGf83m8JS1o/ FAfQ== X-Gm-Message-State: AOAM531Fy56yzr1/qMBAhqBz7l+dLVKHtHUY0AjIRUSkfdJfHEQE7w9U EzPRR8HKoypLBYcZ/OU9y4uqQtTkoHJIyjSMKO3KQK/z96wKjMZxaiQY4XMfwP3gESzFe0JGa6l BBAca8kg3axrCpwgbr5/yy+XNvZNxk1fwQTJcVGMxrw== X-Received: by 2002:a9d:825:: with SMTP id 34mr945258oty.280.1615844686753; Mon, 15 Mar 2021 14:44:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvNwCd3vFGbqij+Agc2kPScOiA2NwJTRe+7O/lDay0H3BCkNuFkHu9RhB4ZAdZV45J5sjr5w== X-Received: by 2002:a9d:825:: with SMTP id 34mr945203oty.280.1615844685081; Mon, 15 Mar 2021 14:44:45 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:61b6:c9e8:5219:a576]) by smtp.gmail.com with ESMTPSA id h18sm232613oov.43.2021.03.15.14.44.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 14:44:44 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2][B] UBUNTU: [Config] fix various annotations syntax errors Date: Mon, 15 Mar 2021 16:44:33 -0500 Message-Id: <20210315214437.799781-6-seth.forshee@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315214437.799781-1-seth.forshee@canonical.com> References: <20210315214437.799781-1-seth.forshee@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" Fix up a number of misformated or incorrect annotations. Properties: no-test-build Ignore: yes Signed-off-by: Seth Forshee --- debian.master/config/annotations | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 399498042091..82756679ded9 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -46,7 +46,7 @@ CONFIG_ACPI_EXTLOG policy<{'amd64': 'm', 'i386': 'm CONFIG_ACPI_CONFIGFS policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}> CONFIG_TPS68470_PMIC_OPREGION policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}> # -CONFIG_ACPI_PROCFS_POWER mark +CONFIG_ACPI_PROCFS_POWER flag CONFIG_ACPI_CUSTOM_METHOD mark note CONFIG_ACPI_CUSTOM_DSDT_FILE note @@ -2471,7 +2471,7 @@ CONFIG_I2C_DEBUG_CORE policy<{'amd64': 'n', 'arm64': ' CONFIG_I2C_DEBUG_ALGO policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}> CONFIG_I2C_DEBUG_BUS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}> # -CONFIG_I2C mark note +CONFIG_I2C mark note CONFIG_I2C_CHARDEV note # Menu: Device Drivers >> I2C support >> I2C support >> I2C Algorithms @@ -3882,8 +3882,8 @@ CONFIG_SPI_HISI_SFC policy<{'arm64': 'm', 'armhf': ' CONFIG_SPI_INTEL_SPI_PCI policy<{'amd64': 'n', 'i386': 'n'}> CONFIG_SPI_INTEL_SPI_PLATFORM policy<{'amd64': 'n', 'i386': 'n'}> # -CONFIG_SPI_INTEL_SPI_PCI mark note -CONFIG_SPI_INTEL_SPI_PLATFORM mark note +CONFIG_SPI_INTEL_SPI_PCI mark note +CONFIG_SPI_INTEL_SPI_PLATFORM mark note # Menu: Device Drivers >> Memory Technology Device (MTD) support >> Self-contained MTD device drivers CONFIG_MTD_PMC551 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> @@ -4128,7 +4128,7 @@ CONFIG_MFD_WM8994 policy<{'amd64': 'm', 'arm64': ' CONFIG_MFD_VEXPRESS_SYSREG policy<{'arm64': 'y', 'armhf': 'y'}> # CONFIG_MFD_SM501 note -CONFIG_MFD_TPS65217 mark note +CONFIG_MFD_TPS65217 mark note # Menu: Device Drivers >> Multifunction device drivers >> Multimedia Capabilities Port drivers @@ -4843,7 +4843,7 @@ CONFIG_FUJITSU_ES policy<{'amd64': 'm', 'arm64': ' CONFIG_THUNDERBOLT_NET policy<{'amd64': 'm', 'i386': 'm'}> CONFIG_HYPERV_NET policy<{'amd64': 'm', 'i386': 'm'}> # -CONFIG_HIPPI note +CONFIG_HIPPI flag CONFIG_XEN_NETDEV_FRONTEND note CONFIG_DEFXX_MMIO flag @@ -6432,8 +6432,8 @@ CONFIG_SCSI_SCAN_ASYNC policy<{'amd64': 'y', 'arm64': ' # CONFIG_SCSI flag CONFIG_CHR_DEV_SG note -CONFIG_BLK_DEV_SD mark note -CONFIG_BLK_DEV_SR mark note +CONFIG_BLK_DEV_SD mark note +CONFIG_BLK_DEV_SR mark note # Menu: Device Drivers >> SCSI device support >> SCSI device support >> OSD-Initiator library CONFIG_SCSI_OSD_INITIATOR policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> @@ -8294,7 +8294,7 @@ CONFIG_VIRTIO_INPUT policy<{'amd64': 'm', 'arm64': ' CONFIG_VIRTIO_MMIO policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}> CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}> # -CONFIG_VIRTIO_PCI mark +CONFIG_VIRTIO_PCI flag CONFIG_VIRTIO_MMIO note # Menu: Device Drivers >> Virtualization drivers @@ -8623,7 +8623,7 @@ CONFIG_XEN_ACPI_PROCESSOR policy<{'amd64': 'y', 'i386': 'y CONFIG_XEN_MCE_LOG policy<{'amd64': 'y'}> CONFIG_XEN_SYMS policy<{'amd64': 'y', 'i386': 'y'}> # -CONFIG_XEN_ACPI_PROCESSOR mark +CONFIG_XEN_ACPI_PROCESSOR mark note # Menu: Device Drivers >> Xen driver support >> Backend driver support CONFIG_XEN_BACKEND policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}> @@ -9373,7 +9373,7 @@ CONFIG_CGROUP_PERF policy<{'amd64': 'y', 'arm64': ' CONFIG_CGROUP_BPF policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CGROUP_DEBUG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> # -CONFIG_DEBUG_BLK_CGROUP mark +CONFIG_DEBUG_BLK_CGROUP flag # Menu: General setup >> Control Group support >> CPU controller CONFIG_CGROUP_SCHED policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> @@ -9637,7 +9637,7 @@ CONFIG_DEBUG_BLOCK_EXT_DEVT policy<{'amd64': 'n', 'arm64': ' CONFIG_CPU_HOTPLUG_STATE_CONTROL policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_LATENCYTOP policy<{'amd64-generic': 'n', 'amd64-lowlatency': 'y', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> # -CONFIG_LATENCYTOP marl note +CONFIG_LATENCYTOP mark note # Menu: Kernel hacking >> Kernel debugging >> Fault-injection framework CONFIG_FAULT_INJECTION policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> @@ -11834,7 +11834,7 @@ CONFIG_ARM_ERRATA_825619 policy<{'armhf': 'y'}> CONFIG_ARM_ERRATA_852421 policy<{'armhf': 'y'}> CONFIG_ARM_ERRATA_852423 policy<{'armhf': 'y'}> # -CONFIG_ARCH_TANGO mark note +CONFIG_ARCH_TANGO mark note # Menu: System Type >> Aspeed BMC architectures >> Architecture: arm @@ -12117,7 +12117,7 @@ CONFIG_MACH_OMAP_GENERIC policy<{'armhf': 'y'}> # Menu: Ubuntu Supplied Third-Party Device Drivers CONFIG_HIO policy<{'amd64': 'm', 'arm64': 'n', 'armhf': 'n', 'i386': 'm', 'ppc64el': 'n'}> # -CONFIG_HIO mark note +CONFIG_HIO mark note # Menu: Virtualization CONFIG_VIRTUALIZATION policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> @@ -12127,7 +12127,7 @@ CONFIG_VHOST_VSOCK policy<{'amd64': 'm', 'arm64': ' CONFIG_VHOST_CROSS_ENDIAN_LEGACY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_KVM policy<{'amd64': 'm', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'm', 'ppc64el': 'y', 's390x': 'y'}> # -CONFIG_KVM note +CONFIG_KVM note # Menu: Virtualization >> Architecture: powerpc CONFIG_KVM_BOOK3S_64 policy<{'ppc64el': 'm'}> From patchwork Mon Mar 15 21:44:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1453577 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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 ozlabs.org (Postfix) with ESMTPS id 4Dzqhz4VV0z9sW1; Tue, 16 Mar 2021 08:45:23 +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 ) id 1lLv1c-0002oC-A6; Mon, 15 Mar 2021 21:45:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lLv15-0002bC-13 for kernel-team@lists.ubuntu.com; Mon, 15 Mar 2021 21:44:47 +0000 Received: from mail-oi1-f200.google.com ([209.85.167.200]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lLv14-0007hD-Ls for kernel-team@lists.ubuntu.com; Mon, 15 Mar 2021 21:44:46 +0000 Received: by mail-oi1-f200.google.com with SMTP id f80so3146774oig.13 for ; Mon, 15 Mar 2021 14:44:46 -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=pzD59+665R0KSUIDbCkndBCacFeWBhAbUcLYWqZTXT8=; b=ZLSZ+YcT7ZeXO8zjkctdQ228V0JU5heo/Q4yrh0IlP0VGXBrnFxWzd/m82qRFL8eOi GFucffKuVvdUBYubNKrXivZ21AghkKlFeRsgJtKDAxIMrVNxMLvqi9DyjvdL3msbZ+0x cPAqSSeCaCoV+2zdDdjqTf9FbSqbd9Muhpl+Wjo0muC6QXJ9hHakSa/Nz/RFAnhlWM8P CXclmlSU4TgiuTSXj7yOut79Wmuhty/zQpow6wIGNjWVOXwxOyydYzi+n7bxC0XKWPTN Fk5gLCk2uuCa5ogCr87hkCoFiLgF9YzWwDxVb6IYI5f+RHO3Q2IOb5GJZ0gLEBJJHJ4w xsdw== X-Gm-Message-State: AOAM530bwAASpzSUQSLPz0cs5Yq3HeKRppHp+KmP36S0h2mC9VElpsWD 9G3Vmxz9cOA/kqPEzD4lb+9+B1BpUwkNOklbcd0tS6wSBE+XAE91/WXNTc6QeiANodrf0Ei5b+e X4IlOVZ3Y/rfH5GVoEr54/V47yxvVl6p+GfqLNKT9Yg== X-Received: by 2002:a9d:748a:: with SMTP id t10mr947466otk.198.1615844684216; Mon, 15 Mar 2021 14:44:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGFlcR8917seKfsnDvZQQ1sJOAELzOeQGwge6KmfZoqf60apUUdz+GSyKtjJs52MGQKaLCsw== X-Received: by 2002:a9d:748a:: with SMTP id t10mr947382otk.198.1615844682574; Mon, 15 Mar 2021 14:44:42 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:61b6:c9e8:5219:a576]) by smtp.gmail.com with ESMTPSA id k8sm5858374oig.6.2021.03.15.14.44.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 14:44:42 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3][X] UBUNTU: [Config] fix various annotations syntax errors Date: Mon, 15 Mar 2021 16:44:31 -0500 Message-Id: <20210315214437.799781-4-seth.forshee@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315214437.799781-1-seth.forshee@canonical.com> References: <20210315214437.799781-1-seth.forshee@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" Fix up a number of misformated or incorrect annotations. Properties: no-test-build Ignore: yes Signed-off-by: Seth Forshee --- debian.master/config/annotations | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index fb5c7e78a169..169de1816373 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -44,7 +44,7 @@ CONFIG_ACPI_NFIT policy<{'amd64': 'm', 'i386': 'm CONFIG_ACPI_NFIT_DEBUG policy<{'amd64': 'n', 'i386': 'n'}> CONFIG_ACPI_EXTLOG policy<{'amd64': 'm', 'i386': 'm'}> # -CONFIG_ACPI_PROCFS_POWER mark +CONFIG_ACPI_PROCFS_POWER flag CONFIG_ACPI_CUSTOM_METHOD mark note CONFIG_ACPI_CUSTOM_DSDT_FILE note @@ -573,7 +573,7 @@ CONFIG_BLK_DEV_UMEM note CONFIG_XEN_BLKDEV_FRONTEND note CONFIG_VIRTIO_BLK note -CONFIG_BLK_DEV_HD note mark +CONFIG_BLK_DEV_HD note flag # Menu: Device Drivers >> Block devices >> Parallel port IDE device support CONFIG_PARIDE policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}> @@ -4113,7 +4113,7 @@ CONFIG_VMXNET3 policy<{'amd64': 'm', 'arm64': ' CONFIG_FUJITSU_ES policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}> CONFIG_HYPERV_NET policy<{'amd64': 'm', 'i386': 'm'}> # -CONFIG_HIPPI note +CONFIG_HIPPI flag CONFIG_XEN_NETDEV_FRONTEND note CONFIG_VMXNET3 note CONFIG_DEFXX_MMIO flag @@ -7076,7 +7076,7 @@ CONFIG_VIRTIO_MMIO policy<{'amd64': 'y', 'arm64': ' CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}> # CONFIG_VIRTIO_MMIO note -CONFIG_VIRTIO_PCI mark +CONFIG_VIRTIO_PCI flag # Menu: Device Drivers >> Virtualization drivers CONFIG_VIRT_DRIVERS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> @@ -7345,7 +7345,7 @@ CONFIG_XEN_ACPI_PROCESSOR policy<{'amd64': 'y', 'i386': 'y CONFIG_XEN_MCE_LOG policy<{'amd64': 'y'}> CONFIG_XEN_SYMS policy<{'amd64': 'y', 'i386': 'y'}> # -CONFIG_XEN_ACPI_PROCESSOR mark +CONFIG_XEN_ACPI_PROCESSOR mark note # Menu: Device Drivers >> Xen driver support >> Xen memory balloon driver CONFIG_XEN_BALLOON policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}> @@ -8008,7 +8008,7 @@ CONFIG_CGROUP_PERF policy<{'amd64': 'y', 'arm64': ' CONFIG_BLK_CGROUP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_DEBUG_BLK_CGROUP policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> # -CONFIG_DEBUG_BLK_CGROUP mark +CONFIG_DEBUG_BLK_CGROUP flag # Menu: General setup >> Control Group support >> Group CPU scheduler CONFIG_CGROUP_SCHED policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>