From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Hans de Goede <hdegoede@redhat.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Sasha Levin <sashal@kernel.org>,
rafael@kernel.org, linux-acpi@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 15/23] ACPI: EC: Remove duplicate ThinkPad X1 Carbon 6th entry from DMI quirks
Date: Sun, 7 Aug 2022 21:38:22 -0400 [thread overview]
Message-ID: <20220808013832.316381-15-sashal@kernel.org> (raw)
In-Reply-To: <20220808013832.316381-1-sashal@kernel.org>
From: Hans de Goede <hdegoede@redhat.com>
[ Upstream commit 0dd6db359e5f206cbf1dd1fd40dd211588cd2725 ]
Somehow the "ThinkPad X1 Carbon 6th" entry ended up twice in the
struct dmi_system_id acpi_ec_no_wakeup[] array. Remove one of
the entries.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/acpi/ec.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index e5b92958c299..defc5796b508 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2118,13 +2118,6 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = {
DMI_MATCH(DMI_PRODUCT_FAMILY, "Thinkpad X1 Carbon 6th"),
},
},
- {
- .ident = "ThinkPad X1 Carbon 6th",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
- DMI_MATCH(DMI_PRODUCT_FAMILY, "ThinkPad X1 Carbon 6th"),
- },
- },
{
.ident = "ThinkPad X1 Yoga 3rd",
.matches = {
--
2.35.1
next prev parent reply other threads:[~2022-08-08 1:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-08 1:38 [PATCH AUTOSEL 5.4 01/23] x86: Handle idle=nomwait cmdline properly for x86_idle Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 02/23] arm64: Do not forget syscall when starting a new thread Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 03/23] arm64: fix oops in concurrently setting insn_emulation sysctls Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 04/23] ext2: Add more validity checks for inode counts Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 05/23] genirq: Don't return error on missing optional irq_request_resources() Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 06/23] genirq: GENERIC_IRQ_IPI depends on SMP Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 07/23] wait: Fix __wait_event_hrtimeout for RT/DL tasks Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 08/23] ARM: dts: imx6ul: add missing properties for sram Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 09/23] ARM: dts: imx6ul: change operating-points to uint32-matrix Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 10/23] ARM: dts: imx6ul: fix csi node compatible Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 11/23] ARM: dts: imx6ul: fix lcdif " Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 12/23] ARM: dts: imx6ul: fix qspi " Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 13/23] spi: synquacer: Add missing clk_disable_unprepare() Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 14/23] ARM: OMAP2+: display: Fix refcount leak bug Sasha Levin
2022-08-08 1:38 ` Sasha Levin [this message]
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 16/23] ACPI: PM: save NVS memory for Lenovo G40-45 Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 17/23] ACPI: LPSS: Fix missing check in register_device_clock() Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 18/23] arm64: dts: qcom: ipq8074: fix NAND node name Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 19/23] arm64: dts: allwinner: a64: orangepi-win: Fix LED " Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 20/23] ARM: shmobile: rcar-gen2: Increase refcount for new reference Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 21/23] hwmon: (sht15) Fix wrong assumptions in device remove callback Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 22/23] PM: hibernate: defer device probing when resuming from hibernation Sasha Levin
2022-08-08 1:38 ` [PATCH AUTOSEL 5.4 23/23] selinux: Add boundary check in put_entry() Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220808013832.316381-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=hdegoede@redhat.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rafael@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox