FAILED: patch "[PATCH] platform/x86: alienware-wmi-wmax: Add G-Mode support to" failed to apply to 6.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.14-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 <[email protected]>.
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.14.y
git checkout FETCH_HEAD
git cherry-pick -x 5ff79cabb23a2f14d2ed29e9596aec908905a0e6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025042129-reliance-rewrap-6d6b@gregkh' --subject-prefix 'PATCH 6.14.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 5ff79cabb23a2f14d2ed29e9596aec908905a0e6 Mon Sep 17 00:00:00 2001
From: Kurt Borja <[email protected]>
Date: Fri, 11 Apr 2025 11:14:35 -0300
Subject: [PATCH] platform/x86: alienware-wmi-wmax: Add G-Mode support to
Alienware m16 R1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some users report the Alienware m16 R1 models, support G-Mode. This was manually verified by inspecting their ACPI tables.
drivers/platform/x86/dell/alienware-wmi-wmax.c +1 -1
@@ -67,7 +67,7 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = {DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m16 R1 AMD"), }, - .driver_data = &generic_quirks, + .driver_data = &g_series_quirks, }, { .ident = "Alienware m17 R5",
Kurt Borja
maintainerPATCH 1/1 platform/x86: alienware-wmi-wmax: Add G-Mode support to Alienware m16 R1
Some users report the Alienware m16 R1 models, support G-Mode. This was manually verified by inspecting their ACPI tables.
--- drivers/platform/x86/dell/alienware-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/dell/alienware-wmi.c +1 -1
@@ -248,7 +248,7 @@ static const struct dmi_system_id alienware_quirks[] __initconst = {DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m16 R1 AMD"), }, - .driver_data = &quirk_x_series, + .driver_data = &quirk_g_series, }, { .callback = dmi_matched,
Signature · 1 line
2.49.0
Sasha Levin
maintainerRe: [PATCH 6.14.y] platform/x86: alienware-wmi-wmax: Add G-Mode support to Alienware m16 R1
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 5ff79cabb23a2f14d2ed29e9596aec908905a0e6
Note: The patch differs from the upstream commit:
---
1: 5ff79cabb23a2 < -: ------------- platform/x86: alienware-wmi-wmax: Add G-Mode support to Alienware m16 R1 -: ------------- > 1: edb98d43e362e platform/x86: alienware-wmi-wmax: Add G-Mode support to Alienware m16 R1
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.14.y | Success | Success |