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