On 08.04.24 12:14, gregkh@xxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxx>. 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 65291dcfcf8936e1b23cfd7718fdfde7cfaf7706 # <resolve conflicts, build, test, etc.> git commit -s
Likely we want: git cherry-pick -sx And then (a) If cherry-picking failed # <resolve conflicts, build, test, etc.> git cherry-pick --continue (b) If cherry-picking succeeded # <resolve issues, build, test, etc.> git commit --amend -- Cheers, David / dhildenb
