On Tue, May 13, 2025 at 08:53:26AM +0200, Sebastian Andrzej Siewior wrote:
On 2025-05-12 12:31:56 [+0200], gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 6.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x 94cff94634e506a4a44684bee1875d2dbf782722 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2025051256-encrust-scribe-9996@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
…
I performed these steps and the patch applied. The diff is the same so git did not attempt to resolve a conflict on its own. HEAD was at v6.1.138 at the time.
Did you build the result? Many times FAILED reports are due to that.
thanks,
greg k-h