On Fri, 06 Dec 2024 11:16:22 +0100 <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > The patch below does not apply to the 6.6-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.6.y > git checkout FETCH_HEAD > git cherry-pick -x f3c7a1ede435e2e45177d7a490a85fb0a0ec96d1 > # <resolve conflicts, build, test, etc.> I tried this on the latest linux-6.6.y (v6.6.63), and the cherry-pick didn't reproduce the conflict as below. $ git checkout stable/linux-6.6.y [...] HEAD is now at bff3e13adb72 Linux 6.6.63 damian@damian:~/linux$ git cherry-pick -x f3c7a1ede435e2e45177d7a490a85fb0a0ec96d1 Auto-merging mm/damon/vaddr-test.h Auto-merging mm/damon/vaddr.c [detached HEAD 072adde8b33a] mm/damon/vaddr: fix issue in damon_va_evenly_split_region() Author: Zheng Yejian <zhengyejian@xxxxxxxxxxxxxxx> Date: Tue Oct 22 16:39:26 2024 +0800 2 files changed, 3 insertions(+), 2 deletions(-) mm/damon/tests/vaddr-kunit.h was originally mm/damon/vaddr-test.h, and the path conversion patch is not on the linux-6.6.y tree. In my case, seems git was able to know the path change and finish cherry-pick successfully was maybe it didn't work on your setup for some reason? Anyway, I'll post the successfully cherry-picked one as a reply to this soon. Thanks, SJ
