On Mon, Feb 10, 2025 at 01:11:27PM -0800, Dixit, Ashutosh wrote:
On Mon, 10 Feb 2025 05:02:14 -0800, gregkh@linuxfoundation.org wrote:
Hi Greg,
The patch below does not apply to the 6.13-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.13.y git checkout FETCH_HEAD git cherry-pick -x 55039832f98c7e05f1cf9e0d8c12b2490abd0f16 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2025021014-cartridge-snooze-15bd@gregkh' --subject-prefix 'PATCH 6.13.y' HEAD^..
Possible dependencies:
This was a modified commit we had sent for 6.12. It will not apply to 6.13. Neither is it needed for 6.13, since the original commit
55039832f98c ("xe/oa: Fix query mode of operation for OAR/OAC")
is already present in 6.13.
The commit you reference here, 55039832f98c ("xe/oa: Fix query mode of operation for OAR/OAC"), is in 6.14-rc1.
Do you mean commit f0ed39830e60 ("xe/oa: Fix query mode of operation for OAR/OAC") instead?
what a mess.
greg k-h