FAILED: patch "[PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan" failed to apply to 6.12-stable tree

FAILED: patch "[PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan" failed to apply to 6.12-stable tree

[gregkh]

The patch below does not apply to the 6.12-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 <stable@vger.kernel.org>.

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.12.y
git checkout FETCH_HEAD
git cherry-pick -x 225d1ee0f5ba3218d1814d36564fdb5f37b50474
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025092126-upstream-favorite-2f89@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..

Possible dependencies:



thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 225d1ee0f5ba3218d1814d36564fdb5f37b50474 Mon Sep 17 00:00:00 2001
From: Antheas Kapenekakis <lkml@antheas.dev>
Date: Tue, 16 Sep 2025 09:28:18 +0200
Subject: [PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan
 quirk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It turns out that the dual screen models use 0x5E for attaching and
detaching the keyboard instead of 0x5F. So, re-add the codes by
reverting commit cf3940ac737d ("platform/x86: asus-wmi: Remove extra
keys from ignore_key_wlan quirk"). For our future reference, add a
comment next to 0x5E indicating that it is used for that purpose.

Fixes: cf3940ac737d ("platform/x86: asus-wmi: Remove extra keys from ignore_key_wlan quirk")
Reported-by: Rahul Chandra <rahul@chandra.net>
Closes: https://lore.kernel.org/all/10020-68c90c80-d-4ac6c580@106290038/
Cc: stable@kernel.org
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
Link: https://patch.msgid.link/20250916072818.196462-1-lkml@antheas.dev
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 3a488cf9ca06..6a62bc5b02fd 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -673,6 +673,8 @@ static void asus_nb_wmi_key_filter(struct asus_wmi_driver *asus_wmi, int *code,
 		if (atkbd_reports_vol_keys)
 			*code = ASUS_WMI_KEY_IGNORE;
 		break;
+	case 0x5D: /* Wireless console Toggle */
+	case 0x5E: /* Wireless console Enable / Keyboard Attach, Detach */
 	case 0x5F: /* Wireless console Disable / Special Key */
 		if (quirks->key_wlan_event)
 			*code = quirks->key_wlan_event;

Re: FAILED: patch "[PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan" failed to apply to 6.12-stable tree

[Antheas Kapenekakis]

On Sun, 21 Sept 2025 at 14:34, <gregkh@linuxfoundation.org> wrote:
>
>
> The patch below does not apply to the 6.12-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 <stable@vger.kernel.org>.
>
> 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.12.y
> git checkout FETCH_HEAD
> git cherry-pick -x 225d1ee0f5ba3218d1814d36564fdb5f37b50474
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025092126-upstream-favorite-2f89@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
>
> Possible dependencies:
>

Is commit 1c1d0401d1b8 ("platform/x86: asus-wmi: Fix ROG button
mapping, tablet mode on ASUS ROG Z13") eligible for backport to
stable? If yes it fixes the apply conflict. Z13 users would appreciate
in any case.

Antheas

>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 225d1ee0f5ba3218d1814d36564fdb5f37b50474 Mon Sep 17 00:00:00 2001
> From: Antheas Kapenekakis <lkml@antheas.dev>
> Date: Tue, 16 Sep 2025 09:28:18 +0200
> Subject: [PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan
>  quirk
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> It turns out that the dual screen models use 0x5E for attaching and
> detaching the keyboard instead of 0x5F. So, re-add the codes by
> reverting commit cf3940ac737d ("platform/x86: asus-wmi: Remove extra
> keys from ignore_key_wlan quirk"). For our future reference, add a
> comment next to 0x5E indicating that it is used for that purpose.
>
> Fixes: cf3940ac737d ("platform/x86: asus-wmi: Remove extra keys from ignore_key_wlan quirk")
> Reported-by: Rahul Chandra <rahul@chandra.net>
> Closes: https://lore.kernel.org/all/10020-68c90c80-d-4ac6c580@106290038/
> Cc: stable@kernel.org
> Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
> Link: https://patch.msgid.link/20250916072818.196462-1-lkml@antheas.dev
> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
>
> diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
> index 3a488cf9ca06..6a62bc5b02fd 100644
> --- a/drivers/platform/x86/asus-nb-wmi.c
> +++ b/drivers/platform/x86/asus-nb-wmi.c
> @@ -673,6 +673,8 @@ static void asus_nb_wmi_key_filter(struct asus_wmi_driver *asus_wmi, int *code,
>                 if (atkbd_reports_vol_keys)
>                         *code = ASUS_WMI_KEY_IGNORE;
>                 break;
> +       case 0x5D: /* Wireless console Toggle */
> +       case 0x5E: /* Wireless console Enable / Keyboard Attach, Detach */
>         case 0x5F: /* Wireless console Disable / Special Key */
>                 if (quirks->key_wlan_event)
>                         *code = quirks->key_wlan_event;
>
>

Re: FAILED: patch "[PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan" failed to apply to 6.12-stable tree

[Greg KH]

On Sun, Sep 21, 2025 at 03:57:25PM +0200, Antheas Kapenekakis wrote:
> On Sun, 21 Sept 2025 at 14:34, <gregkh@linuxfoundation.org> wrote:
> >
> >
> > The patch below does not apply to the 6.12-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 <stable@vger.kernel.org>.
> >
> > 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.12.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 225d1ee0f5ba3218d1814d36564fdb5f37b50474
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025092126-upstream-favorite-2f89@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> >
> > Possible dependencies:
> >
> 
> Is commit 1c1d0401d1b8 ("platform/x86: asus-wmi: Fix ROG button
> mapping, tablet mode on ASUS ROG Z13") eligible for backport to
> stable? If yes it fixes the apply conflict. Z13 users would appreciate
> in any case.

I don't see that git commit in Linus's tree, are you sure it is correct?

thanks,

greg k-h

Re: FAILED: patch "[PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan" failed to apply to 6.12-stable tree

[Antheas Kapenekakis]

On Sun, 21 Sept 2025 at 18:29, Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Sun, Sep 21, 2025 at 03:57:25PM +0200, Antheas Kapenekakis wrote:
> > On Sun, 21 Sept 2025 at 14:34, <gregkh@linuxfoundation.org> wrote:
> > >
> > >
> > > The patch below does not apply to the 6.12-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 <stable@vger.kernel.org>.
> > >
> > > 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.12.y
> > > git checkout FETCH_HEAD
> > > git cherry-pick -x 225d1ee0f5ba3218d1814d36564fdb5f37b50474
> > > # <resolve conflicts, build, test, etc.>
> > > git commit -s
> > > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025092126-upstream-favorite-2f89@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> > >
> > > Possible dependencies:
> > >
> >
> > Is commit 1c1d0401d1b8 ("platform/x86: asus-wmi: Fix ROG button
> > mapping, tablet mode on ASUS ROG Z13") eligible for backport to
> > stable? If yes it fixes the apply conflict. Z13 users would appreciate
> > in any case.
>
> I don't see that git commit in Linus's tree, are you sure it is correct?

Sorry, I picked a hash from my own tree by mistake, it is commit
132bfcd24925 ("platform/x86: asus-wmi: Fix ROG button mapping, tablet
mode on ASUS ROG Z13") in v6.17-rc5.

Antheas

> thanks,
>
> greg k-h
>

Re: FAILED: patch "[PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan" failed to apply to 6.12-stable tree

[Greg KH]

On Sun, Sep 21, 2025 at 06:34:27PM +0200, Antheas Kapenekakis wrote:
> On Sun, 21 Sept 2025 at 18:29, Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Sun, Sep 21, 2025 at 03:57:25PM +0200, Antheas Kapenekakis wrote:
> > > On Sun, 21 Sept 2025 at 14:34, <gregkh@linuxfoundation.org> wrote:
> > > >
> > > >
> > > > The patch below does not apply to the 6.12-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 <stable@vger.kernel.org>.
> > > >
> > > > 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.12.y
> > > > git checkout FETCH_HEAD
> > > > git cherry-pick -x 225d1ee0f5ba3218d1814d36564fdb5f37b50474
> > > > # <resolve conflicts, build, test, etc.>
> > > > git commit -s
> > > > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025092126-upstream-favorite-2f89@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> > > >
> > > > Possible dependencies:
> > > >
> > >
> > > Is commit 1c1d0401d1b8 ("platform/x86: asus-wmi: Fix ROG button
> > > mapping, tablet mode on ASUS ROG Z13") eligible for backport to
> > > stable? If yes it fixes the apply conflict. Z13 users would appreciate
> > > in any case.
> >
> > I don't see that git commit in Linus's tree, are you sure it is correct?
> 
> Sorry, I picked a hash from my own tree by mistake, it is commit
> 132bfcd24925 ("platform/x86: asus-wmi: Fix ROG button mapping, tablet
> mode on ASUS ROG Z13") in v6.17-rc5.

No problem, that worked, thanks!

greg k-h