From patchwork Tue Apr 20 18:11:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1468441 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 4FPsGK0HySz9tlC; Wed, 21 Apr 2021 04:12:09 +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 1lYuqz-0001Mw-I9; Tue, 20 Apr 2021 18:12:05 +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 1lYuqp-0001LJ-7B for kernel-team@lists.ubuntu.com; Tue, 20 Apr 2021 18:11:55 +0000 Received: from mail-pj1-f71.google.com ([209.85.216.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lYuqo-0001Kw-S9 for kernel-team@lists.ubuntu.com; Tue, 20 Apr 2021 18:11:55 +0000 Received: by mail-pj1-f71.google.com with SMTP id t16-20020a17090a0d10b029014e4569c8b6so18303420pja.4 for ; Tue, 20 Apr 2021 11:11:54 -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:cc:subject:date:message-id:in-reply-to :references; bh=+/zMniTCWyeIf53IxDBF6KJadT4aUdtcfr5sUsVYx/I=; b=irKq23YY4jiYsWMyvlDUtnmV7gRCNbHxNVvai/pOildaJHLS7PrSRUiIkH+oBCt1XD itaP+UL7yb0PlwlTA7KNJd90MlS9oFZZaaCznIS53BS16fjfsWoAUszborplT5njq2KL W7q/DB3qB9c3UHehlzSYOAEH5/3NImYgpZIBGDxBMgSRy0DdR3Kcdo7O9iOqknc2cpeS 8vWNOR47u/jmrf3nwu8UPv5XDg7RvusLyULPpATOQTV+eIq1LZkuL0zfeWT248tiGeZ4 c16LhRZD5VfS2NY5eBzDr6mF68gtbmU5Ufvz3XhkNmtcUghxzDMIBYSFoA1UMoE0rVvT gxJg== X-Gm-Message-State: AOAM533iJPIEHKPnoDdKZpRLbYfan9aOMk/yVvpbQ0jKbjuw5i87PgVz 7zU8q4ncg6gZefQ48t7Hz5zVO+WWG1YGsTRaZi1RIqDkSbzPf4mP6qNcV80YCEcTiQCp4D8sUQ4 mGoOFDQ4NexneJle9V1fM41YyKxYpkec059+SAl5VSA== X-Received: by 2002:a17:902:b188:b029:e8:bd90:3f99 with SMTP id s8-20020a170902b188b02900e8bd903f99mr30169321plr.6.1618942313195; Tue, 20 Apr 2021 11:11:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAwmCCry7cSwtdSitw4urui6XEbS8vLt0y9Wc90twM9fvUxdLLee3/iemviwaJxwKZUhz+Ig== X-Received: by 2002:a17:902:b188:b029:e8:bd90:3f99 with SMTP id s8-20020a170902b188b02900e8bd903f99mr30169304plr.6.1618942313017; Tue, 20 Apr 2021 11:11:53 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id e14sm16259798pga.14.2021.04.20.11.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 11:11:52 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] gcp: Disable CONFIG_DELL_SMBIOS_SMM, CONFIG_DELL_UART_BACKLIGHT, CONFIG_I2C_AMD_MP2 Date: Tue, 20 Apr 2021 12:11:41 -0600 Message-Id: <20210420181141.30530-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210420181141.30530-1-tim.gardner@canonical.com> References: <20210420181141.30530-1-tim.gardner@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1925241 Enforcement annotations indicate that these config options should never have been set. Signed-off-by: Tim Gardner Acked-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules | 1 - debian.gcp/config/config.common.ubuntu | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules b/debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules index a7cd5e6bf7ee..46c43d3d68e0 100644 --- a/debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules +++ b/debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules @@ -959,7 +959,6 @@ dell-rbtn dell-smbios dell-smm-hwmon dell-smo8800 -dell-uart-backlight dell-wmi dell-wmi-aio dell-wmi-descriptor diff --git a/debian.gcp/config/config.common.ubuntu b/debian.gcp/config/config.common.ubuntu index ecf964926e6e..61c0a4a685a5 100644 --- a/debian.gcp/config/config.common.ubuntu +++ b/debian.gcp/config/config.common.ubuntu @@ -1669,10 +1669,10 @@ CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m CONFIG_DELL_RBU=m CONFIG_DELL_SMBIOS=m -CONFIG_DELL_SMBIOS_SMM=y +# CONFIG_DELL_SMBIOS_SMM is not set CONFIG_DELL_SMBIOS_WMI=y CONFIG_DELL_SMO8800=m -CONFIG_DELL_UART_BACKLIGHT=m +# CONFIG_DELL_UART_BACKLIGHT is not set CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m CONFIG_DELL_WMI_DESCRIPTOR=m @@ -3027,7 +3027,7 @@ CONFIG_I2C_ALI15X3=m CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m -CONFIG_I2C_AMD_MP2=y +# CONFIG_I2C_AMD_MP2 is not set CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CBUS_GPIO=m CONFIG_I2C_CHARDEV=y