From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E9711BD000 for ; Tue, 1 Oct 2024 11:21:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727781672; cv=none; b=YqJqXpmzya/+kCpN7vToXJhq9cybRncxkE3ZL5LMwAxCYrGYEpkWmwVcCPPZUJyxMS7zCgWGUTAEdSGOp1IbW7ydT+HMiW3zCwE3g1Igym+WEL3+hz+JVnJwWdT1c/ZdzPpBxPTquM6g00aNWsIuDdJg/xzrGdPSumzLo02B7Go= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727781672; c=relaxed/simple; bh=tTYjKzVMQc6O5jr4K6bdruHV50tKSVU5Cyl4/z0KEwo=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=MZ/cOmdo9lWqXNhQvUrSA1lDzDKek1wcefWNonNBtDmOY4QqikCqDWJ3L+mmZMDwcfUBl1uPdxUm3CSf+C71jAuHC5ODjbf6dfcFbC+w/jzDMNn+VepK4AMUzXzRSjCllRkA9M+6crp87KZoHunolv7EplzK4TRkBBJ4/MCgPS8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LP+UbLPI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LP+UbLPI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBCB6C4CEC6; Tue, 1 Oct 2024 11:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727781672; bh=tTYjKzVMQc6O5jr4K6bdruHV50tKSVU5Cyl4/z0KEwo=; h=Subject:To:Cc:From:Date:From; b=LP+UbLPIKuGqNWgGlmGJJ2h8YQ3siA5bIzaOATZFAlWkPsCdvb9ovk0jqC9fXnDFF iN0SYGu/zO6kUFC/Qp3kAKj6rne4Jq5UZ+4c1BSKZ5OGD0x5xczVlAnjZu5muPoXbO WR27M43IW6oK153yaXASb9HiJntPANgMpZ6pdRyw= Subject: FAILED: patch "[PATCH] ACPI: resource: Do IRQ override on MECHREV GM7XG0M" failed to apply to 6.1-stable tree To: me@linux.beauty,rafael.j.wysocki@intel.com,stable@vger.kernel.org Cc: From: Date: Tue, 01 Oct 2024 13:21:01 +0200 Message-ID: <2024100101-area-scarce-20d5@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x b53f09ecd602d7b8b7da83b0890cbac500b6a9b9 # git commit -s git send-email --to '' --in-reply-to '2024100101-area-scarce-20d5@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: b53f09ecd602 ("ACPI: resource: Do IRQ override on MECHREV GM7XG0M") 6eaf375a5a98 ("ACPI: resource: Do IRQ override on GMxBGxx (XMG APEX 17 M23)") 424009ab2030 ("ACPI: resource: Drop .ident values from dmi_system_id tables") d37273af0e42 ("ACPI: resource: Consolidate IRQ trigger-type override DMI tables") c1ed72171ed5 ("ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA") 453b014e2c29 ("ACPI: resource: Fix IRQ override quirk for PCSpecialist Elimina Pro 16 M") 56fec0051a69 ("ACPI: resource: Add IRQ override quirk for PCSpecialist Elimina Pro 16 M") 9728ac221160 ("ACPI: resource: Always use MADT override IRQ settings for all legacy non i8042 IRQs") 2d331a6ac481 ("ACPI: resource: revert "Remove "Zen" specific match and quirks"") a9c4a912b7dc ("ACPI: resource: Remove "Zen" specific match and quirks") 71a485624c4c ("ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P") 05cda427126f ("ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CBA") 2d0ab14634a2 ("ACPI: resource: Add Medion S17413 to IRQ override quirk") 65eb2867f5bf ("ACPI: resource: Skip IRQ override on Asus Expertbook B2402FBA") 17bb7046e7ce ("ACPI: resource: Do IRQ override on all TongFang GMxRGxx") cb18703c1797 ("ACPI: resource: Add IRQ overrides for MAINGEAR Vector Pro 2 models") 77c724888238 ("ACPI: resource: Skip IRQ override on Asus Expertbook B2402CBA") 7203481fd12b ("ACPI: resource: Add Asus ExpertBook B2502 to Asus quirks") f3cb9b740869 ("ACPI: resource: do IRQ override on Lenovo 14ALC7") 7592b79ba4a9 ("ACPI: resource: do IRQ override on XMG Core 15") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b53f09ecd602d7b8b7da83b0890cbac500b6a9b9 Mon Sep 17 00:00:00 2001 From: Li Chen Date: Sat, 3 Aug 2024 16:13:18 +0800 Subject: [PATCH] ACPI: resource: Do IRQ override on MECHREV GM7XG0M Listed device need the override for the keyboard to work. Fixes: 9946e39fe8d0 ("ACPI: resource: skip IRQ override on AMD Zen platforms") Cc: All applicable Signed-off-by: Li Chen Link: https://patch.msgid.link/87y15e6n35.wl-me@linux.beauty Signed-off-by: Rafael J. Wysocki diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index df5d5a554b38..aa9990507f34 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -554,6 +554,12 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { * to have a working keyboard. */ static const struct dmi_system_id irq1_edge_low_force_override[] = { + { + /* MECHREV Jiaolong17KS Series GM7XG0M */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GM7XG0M"), + }, + }, { /* XMG APEX 17 (M23) */ .matches = {