From patchwork Wed Nov 6 18:57:41 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: 1190626 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=) 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 477bQK2Bk9z9sP6; Thu, 7 Nov 2019 05:58:01 +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 1iSQVB-0001nC-GW; Wed, 06 Nov 2019 18:57:57 +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 1iSQV9-0001me-Uv for kernel-team@lists.ubuntu.com; Wed, 06 Nov 2019 18:57:55 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iSQV9-00041I-Ln for kernel-team@lists.ubuntu.com; Wed, 06 Nov 2019 18:57:55 +0000 Received: by mail-qk1-f197.google.com with SMTP id z64so26006027qkc.15 for ; Wed, 06 Nov 2019 10:57:55 -0800 (PST) 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=GY89HQfLS9sCAuQYlyfLPmXuAx4S8DicKNxVn5vEU2U=; b=AGY45kSBfypq/Iid5oK1RwAbAChPzC/gthYlIQ5l09H0keaFX19P6ZGRnFfg/S6b9P QpjaDmwLFUxAQShZahyEV7nNPoQj98NYBRbPLr+KQI3YXbHMxg9LynpIEZmXtRKDljA5 6QwLrFI2a4v77/R/4aGKXWO3P455tPIlAUtEEN3IE1NQjkrZIFDarXw9O/ygP0ccD9sj FnEXVIX6aFyIoZP87ZOmv5yEdjGhi4woVAsnXWv+41V8Ef/QYuFLNpanxfg3sosUnh3d hA2MzGJaalTNyHShyrk4X3S0ifWQtFM23OHG+VKeZeffBzWHIgjkEIF/ADOHyImNRg4y Bsrg== X-Gm-Message-State: APjAAAUaDrFUisCf/9QqWrZMuZR2aXUe3wD7Yzw7lMR1HRoODFblzFw1 EKagoTMtf3rSdqPQd1VTwHGDeu03B6HgxN1mAkSeO26opfGvGjX1e+vD4cnTwQLz4SBAyO9xOgl wrJAB/5VnoSjgKcxV20QxTzzsaYoEc3LTCrUvlHz/ X-Received: by 2002:ac8:4782:: with SMTP id k2mr4039414qtq.58.1573066674387; Wed, 06 Nov 2019 10:57:54 -0800 (PST) X-Google-Smtp-Source: APXvYqwLRYRRuGkPTFyBjiwvaEYsecNUwi/kyBbnUvg0TzFbYkz+jp6RqNK0pRlUINciLqA/ceNLWA== X-Received: by 2002:ac8:4782:: with SMTP id k2mr4039401qtq.58.1573066674078; Wed, 06 Nov 2019 10:57:54 -0800 (PST) Received: from gallifrey.lan ([2804:14c:4e6:443:946b:525b:cf5:2c60]) by smtp.gmail.com with ESMTPSA id s21sm6478841qkg.24.2019.11.06.10.57.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2019 10:57:53 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [disco:linux-gcp][PATCH 2/2] UBUNTU: [Config] Fix annotations file Date: Wed, 6 Nov 2019 15:57:41 -0300 Message-Id: <20191106185742.5835-5-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106185742.5835-1-marcelo.cerri@canonical.com> References: <20191106185742.5835-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: https://bugs.launchpad.net/bugs/1851538 Replace ENFORCE with ENFORCED to ensure the config options checks are not being ignored. Also update the corresponding config options back to the desirable value. Signed-off-by: Marcelo Henrique Cerri --- .../abi/5.0.0-1021.21/amd64/gcp.modules | 1 - debian.gcp/config/annotations | 42 +++++++++---------- debian.gcp/config/config.common.ubuntu | 4 +- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules b/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules index 97e6f14f9aa5..a6ea236301f1 100644 --- a/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules +++ b/debian.gcp/abi/5.0.0-1021.21/amd64/gcp.modules @@ -1013,7 +1013,6 @@ dmm32at dmx3191d dn_rtmsg dnet -dp83640 dp83822 dp83848 dp83867 diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations index 7ec8b56a13e3..3f83e75ce50b 100644 --- a/debian.gcp/config/annotations +++ b/debian.gcp/config/annotations @@ -7,78 +7,78 @@ include "../../debian.master/config/annotations" # Menu: Device Drivers >> Block devices CONFIG_BLK_DEV_FD policy<{'amd64': 'n'}> # -CONFIG_BLK_DEV_FD flag note +CONFIG_BLK_DEV_FD flag note # Menu: Device Drivers >> I2C support >> I2C support >> I2C Hardware Bus support CONFIG_I2C_AMD_MP2 policy<{'amd64': 'n'}> # -CONFIG_I2C_AMD_MP2 flag note +CONFIG_I2C_AMD_MP2 flag note # Menu: Device Drivers >> Network device support >> Wireless LAN >> Atheros/Qualcomm devices CONFIG_WCN36XX_SNAPDRAGON_HACKS policy<{'amd64': 'n'}> # -CONFIG_WCN36XX_SNAPDRAGON_HACKS flag note +CONFIG_WCN36XX_SNAPDRAGON_HACKS flag note # Menu: Device Drivers >> PTP clock support >> PTP clock support CONFIG_DP83640_PHY policy<{'amd64': 'n'}> # -CONFIG_DP83640_PHY mark note note +CONFIG_DP83640_PHY mark note note # Menu: Device Drivers >> SCSI device support >> SCSI device support >> SCSI low-level drivers CONFIG_SCSI_VIRTIO policy<{'amd64': 'y'}> # -CONFIG_SCSI_VIRTIO flag note note +CONFIG_SCSI_VIRTIO flag note note # Menu: Device Drivers >> X86 Platform Specific Device Drivers CONFIG_DELL_UART_BACKLIGHT policy<{'amd64': 'n'}> CONFIG_DELL_SMBIOS_SMM policy<{'amd64': 'n'}> # -CONFIG_DELL_UART_BACKLIGHT flag note -CONFIG_DELL_SMBIOS_SMM flag note +CONFIG_DELL_UART_BACKLIGHT flag note +CONFIG_DELL_SMBIOS_SMM flag note # Menu: Kernel hacking CONFIG_PANIC_ON_OOPS policy<{'amd64': 'y'}> # -CONFIG_PANIC_ON_OOPS flag note note +CONFIG_PANIC_ON_OOPS flag note note # Menu: Kernel hacking >> Debug Lockups and Hangs CONFIG_BOOTPARAM_HARDLOCKUP_PANIC policy<{'amd64': 'y'}> CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC policy<{'amd64': 'y'}> # -CONFIG_BOOTPARAM_HARDLOCKUP_PANIC flag note -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC flag note +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC flag note +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC flag note # Menu: Library routines -CONFIG_RAID6_PQ_DEFAULT_ALG policy<'amd64': 'avx2x4'> -CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<'amd64': 'y'> +CONFIG_RAID6_PQ_DEFAULT_ALG policy<{'amd64': '"avx2x4"'}> +CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL policy<{'amd64': 'y'}> # -CONFIG_RAID6_PQ_DEFAULT_ALG mark note -CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark note +CONFIG_RAID6_PQ_DEFAULT_ALG mark note +CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL mark note # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers CONFIG_BT_QCOMSMD_HACK policy<{'amd64': 'n'}> # -CONFIG_BT_QCOMSMD_HACK flag note +CONFIG_BT_QCOMSMD_HACK flag note # Menu: Networking support >> Networking options CONFIG_NETWORK_PHY_TIMESTAMPING policy<{'amd64': 'n'}> # -CONFIG_NETWORK_PHY_TIMESTAMPING flag note note +CONFIG_NETWORK_PHY_TIMESTAMPING flag note note # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration CONFIG_NETFILTER_NETLINK_QUEUE policy<{'amd64': 'y'}> CONFIG_NETFILTER_NETLINK_LOG policy<{'amd64': 'y'}> # -CONFIG_NETFILTER_NETLINK_QUEUE flag note -CONFIG_NETFILTER_NETLINK_LOG flag note +CONFIG_NETFILTER_NETLINK_QUEUE flag note +CONFIG_NETFILTER_NETLINK_LOG flag note # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support CONFIG_NF_CONNTRACK policy<{'amd64': 'y'}> CONFIG_NF_CONNTRACK_PROCFS policy<{'amd64': 'y'}> CONFIG_NF_CT_NETLINK policy<{'amd64': 'y'}> # -CONFIG_NF_CONNTRACK flag note -CONFIG_NF_CONNTRACK_PROCFS flag note -CONFIG_NF_CT_NETLINK flag note +CONFIG_NF_CONNTRACK flag note +CONFIG_NF_CONNTRACK_PROCFS flag note +CONFIG_NF_CT_NETLINK flag note CONFIG_NF_CONNTRACK_PROCFS flag diff --git a/debian.gcp/config/config.common.ubuntu b/debian.gcp/config/config.common.ubuntu index 28e8aac81525..02b8d3366910 100644 --- a/debian.gcp/config/config.common.ubuntu +++ b/debian.gcp/config/config.common.ubuntu @@ -1671,7 +1671,7 @@ CONFIG_DNET=m CONFIG_DNOTIFY=y CONFIG_DNS_RESOLVER=y CONFIG_DOUBLEFAULT=y -CONFIG_DP83640_PHY=m +# CONFIG_DP83640_PHY is not set CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m @@ -5591,6 +5591,8 @@ CONFIG_RADIO_WL1273=m CONFIG_RADIO_WL128X=m CONFIG_RAID6_PQ=m CONFIG_RAID6_PQ_BENCHMARK=y +CONFIG_RAID6_PQ_DEFAULT_ALG="avx2x4" +CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL=y CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y