linux-next: semantic conflict between the hid and pm trees
From: Sasha Levin
Date: Fri Nov 20 2026 - 14:45:13 EST
Hi Mark,
Once you take the current hid tree again, it has a conflict with the pm
tree that doesn't break the build.
d220bf485598 ("HID: asus: Cycle the platform profile from the Zenbook
Duo profile key") in the hid tree checks
IS_REACHABLE(CONFIG_ACPI_PLATFORM_PROFILE), and 699041135f75 ("platform
profile: Extract the core from ACPI") in the pm tree renames that symbol
to PLATFORM_PROFILE. With both, the check is always false and the
profile key does nothing.
It's the same rename you already fix up in drivers/platform/asus/Kconfig
in the pdx86 merge. The fix for the merge:
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -438,7 +438,7 @@ static int asus_platform_profile_cycle(struct asus_drvdata *drvdata)
struct asus_worker *worker = drvdata->worker;
struct asus_work_action *action, *pending;
- if (!IS_REACHABLE(CONFIG_ACPI_PLATFORM_PROFILE))
+ if (!IS_REACHABLE(CONFIG_PLATFORM_PROFILE))
return 0;
guard(spinlock_irqsave)(&worker->lock);
@@ -870,7 +870,7 @@ static void asus_work(struct work_struct *work)
asus_kbd_wmi_fan(worker->hdev, &action->data.fan_hid_data);
break;
case PLATFORM_PROFILE_CYCLE:
- if (!IS_REACHABLE(CONFIG_ACPI_PLATFORM_PROFILE))
+ if (!IS_REACHABLE(CONFIG_PLATFORM_PROFILE))
break;
ret = platform_profile_cycle();
if (ret)
--
Thanks,
Sasha