FAILED: patch "[PATCH] platform/x86: alienware-wmi-wmax: Extend support to more" 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 202a861205905629c5f10ce0a8358623485e1ae9
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025042124-pumice-kebab-9d24@gregkh' --subject-prefix 'PATCH 6.14.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 202a861205905629c5f10ce0a8358623485e1ae9 Mon Sep 17 00:00:00 2001
From: Kurt Borja <[email protected]>
Date: Fri, 11 Apr 2025 11:14:36 -0300
Subject: [PATCH] platform/x86: alienware-wmi-wmax: Extend support to more
laptops
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Extend thermal control support to:
- Alienware Area-51m R2
- Alienware m16 R1
- Alienware m16 R2
- Dell G16 7630
- Dell G5 5505 SE
drivers/platform/x86/dell/alienware-wmi-wmax.c +48 -0
@@ -61,6 +61,22 @@ static struct awcc_quirks generic_quirks = {static struct awcc_quirks empty_quirks;static const struct dmi_system_id awcc_dmi_table[]__initconst = { + { + .ident ="Alienware Area-51m R2" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Alienware Area-51m R2" ), + }, + .driver_data = &generic_quirks, + }, + { + .ident ="Alienware m16 R1" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Alienware m16 R1" ), + }, + .driver_data = &g_series_quirks, + }, { .ident ="Alienware m16 R1 AMD" , .matches = {
@@ -69,6 +85,14 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = { }, .driver_data = &g_series_quirks, }, + { + .ident = "Alienware m16 R2", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m16 R2"), + }, + .driver_data = &generic_quirks, + }, { .ident ="Alienware m17 R5" , .matches = {
@@ -93,6 +117,14 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = { }, .driver_data = &generic_quirks, }, + { + .ident = "Alienware x15 R2", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x15 R2"), + }, + .driver_data = &generic_quirks, + }, { .ident ="Alienware x17 R2" , .matches = {
@@ -125,6 +157,14 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = { }, .driver_data = &g_series_quirks, }, + { + .ident = "Dell Inc. G16 7630", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell G16 7630"), + }, + .driver_data = &g_series_quirks, + }, { .ident ="Dell Inc. G3 3500" , .matches = {
@@ -149,6 +189,14 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = { }, .driver_data = &g_series_quirks, }, + { + .ident = "Dell Inc. G5 5505", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "G5 5505"), + }, + .driver_data = &g_series_quirks, + }, }; enum WMAX_THERMAL_INFORMATION_OPERATIONS {
Kurt Borja
maintainerPATCH 1/1 platform/x86: alienware-wmi-wmax: Extend support to more laptops
Extend thermal control support to:
- Alienware Area-51m R2
- Alienware m16 R1
- Alienware m16 R2
- Dell G16 7630
- Dell G5 5505 SE
--- drivers/platform/x86/dell/alienware-wmi.c | 54 +++++++++++++++++++++++ 1 file changed, 54 insertions(+)
drivers/platform/x86/dell/alienware-wmi.c +54 -0
@@ -214,6 +214,15 @@ static int __init dmi_matched(const struct dmi_system_id *dmi) }static const struct dmi_system_id alienware_quirks[]__initconst = { + { + .callback = dmi_matched, + .ident ="Alienware Area-51m R2" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Alienware Area-51m R2" ), + }, + .driver_data = &quirk_x_series, + }, { .callback = dmi_matched, .ident ="Alienware ASM100" ,
@@ -241,6 +250,15 @@ static const struct dmi_system_id alienware_quirks[] __initconst = { }, .driver_data = &quirk_asm201, }, + { + .callback = dmi_matched, + .ident = "Alienware m16 R1", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m16 R1"), + }, + .driver_data = &quirk_g_series, + }, { .callback = dmi_matched, .ident = "Alienware m16 R1 AMD",
@@ -250,6 +268,15 @@ static const struct dmi_system_id alienware_quirks[] __initconst = { }, .driver_data = &quirk_x_series, }, + { + .callback = dmi_matched, + .ident = "Alienware m16 R2", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m16 R2"), + }, + .driver_data = &quirk_x_series, + }, { .callback = dmi_matched, .ident = "Alienware m17 R5",
@@ -277,6 +304,15 @@ static const struct dmi_system_id alienware_quirks[] __initconst = { }, .driver_data = &quirk_x_series, }, + { + .callback = dmi_matched, + .ident = "Alienware x15 R2", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Alienware" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x15 R2"), + }, + .driver_data = &quirk_x_series, + }, { .callback = dmi_matched, .ident = "Alienware x17 R2",
@@ -340,6 +376,15 @@ static const struct dmi_system_id alienware_quirks[] __initconst = { }, .driver_data = &quirk_g_series, }, + { + .callback = dmi_matched, + .ident = "Dell Inc. G16 7630", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell G16 7630"), + }, + .driver_data = &quirk_g_series, + }, { .callback = dmi_matched, .ident = "Dell Inc. G3 3500",
@@ -367,6 +412,15 @@ static const struct dmi_system_id alienware_quirks[] __initconst = { }, .driver_data = &quirk_g_series, }, + { + .callback = dmi_matched, + .ident = "Dell Inc. G5 5505", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "G5 5505"), + }, + .driver_data = &quirk_g_series, + }, { .callback = dmi_matched, .ident = "Dell Inc. Inspiron 5675",
Signature · 1 line
2.49.0
Sasha Levin
maintainerRe: [PATCH 6.14.y] platform/x86: alienware-wmi-wmax: Extend support to more laptops
[ 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: 202a861205905629c5f10ce0a8358623485e1ae9
Note: The patch differs from the upstream commit:
---
1: 202a861205905 < -: ------------- platform/x86: alienware-wmi-wmax: Extend support to more laptops -: ------------- > 1: 44e43dfcdd33a platform/x86: alienware-wmi-wmax: Extend support to more laptops
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.14.y | Success | Success |