From: Greg KH <gregkh@linuxfoundation.org>
To: Antheas Kapenekakis <lkml@antheas.dev>
Cc: ilpo.jarvinen@linux.intel.com, rahul@chandra.net, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan" failed to apply to 6.12-stable tree
Date: Sun, 21 Sep 2025 18:41:04 +0200 [thread overview]
Message-ID: <2025092155-gladiator-rocking-c411@gregkh> (raw)
In-Reply-To: <CAGwozwF3SgRG7ZYSj629NOJx0dWSBYH67v_wwQ7WdKOU9cGxow@mail.gmail.com>
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
prev parent reply other threads:[~2025-09-21 16:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-21 12:34 FAILED: patch "[PATCH] platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan" failed to apply to 6.12-stable tree gregkh
2025-09-21 13:57 ` Antheas Kapenekakis
2025-09-21 16:29 ` Greg KH
2025-09-21 16:34 ` Antheas Kapenekakis
2025-09-21 16:41 ` Greg KH [this message]
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=2025092155-gladiator-rocking-c411@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=lkml@antheas.dev \
--cc=rahul@chandra.net \
--cc=stable@vger.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