On Tue, Feb 11, 2025 at 02:03:54PM +0000, Wei Yang wrote: > On Tue, Feb 11, 2025 at 10:48:28AM +0100, 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 4f6a6bed0bfef4b966f076f33eb4f5547226056a > ># <resolve conflicts, build, test, etc.> > >git commit -s > >git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2025021128-repeater-percolate-6131@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. > > > >Possible dependencies: > > > > Hi, Greg > > commit 5729e06c819184b7ba40869c1ad53e1a463040b2 > Author: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx> > Date: Thu May 18 10:55:10 2023 -0400 > > maple_tree: fix static analyser cppcheck issue > > This commit reorder the comparison and leads to the conflict. > > If you pick up this one first and then pick up 4f6a6bed0bfef4b966f0, there is > no complain. > > What do I suppose to do? Re-send these two patches? or merge then into one? I took the above one first and then this one applied just fine, so nothing else for you to have to do at all, thanks! greg k-h
