Hi Greg, On Mon, 15 Jul 2024 13:34:48 +0200 <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 310d6c15e9104c99d5d9d0ff8e5383a79da7d5e6 But this doesn't reproduce the failure on my machine, like below? $ git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y [...] $ git checkout FETCH_HEAD [...] HEAD is now at cac15753b8ce Linux 6.1.99 $ git cherry-pick -x 310d6c15e9104c99d5d9d0ff8e5383a79da7d5e6 Auto-merging mm/damon/core.c [detached HEAD ecd04159c5f3] mm/damon/core: merge regions aggressively when max_nr_regions is unmet Date: Mon Jun 24 10:58:14 2024 -0700 1 file changed, 19 insertions(+), 2 deletions(-) Could the faulure depend on something such as git version? For such a case, attaching the resulting patch below. Thanks, SJ [...] ====================== >8 ========================
