Linux Power Management development
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Jiri Kosina <jikos@kernel.org>,
	Benjamin Tissoires <bentiss@kernel.org>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	Joshua Leivenzon <hacker1024@users.sourceforge.net>,
	linux-input@vger.kernel.org, linux-pm@vger.kernel.org,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: semantic conflict between the hid and pm trees
Date: Fri, 20 Nov 2026 14:45:07 -0500	[thread overview]
Message-ID: <20261120194507.593601-1-sashal@kernel.org> (raw)

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

                 reply	other threads:[~2026-11-20 19:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20261120194507.593601-1-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=bentiss@kernel.org \
    --cc=broonie@kernel.org \
    --cc=hacker1024@users.sourceforge.net \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rafael@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