Re: linux-next: manual merge of the mm-nonmm-unstable tree with the mm tree

[Andrew Morton]

On Tue, 15 Sep 2026 14:32:22 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:
> 
>   mm/damon/vaddr.c
> 
> between commits:
> 
>   6acc47b87e9f0 ("mm/damon/vaddr: avoid hw-driven pte updates during damon_hugetlb_mkold()")
>   24f6b1a0ab44a ("mm/damon/vaddr: respect folio end for DAMOS_STAT")
>   f256012bb6a1c ("mm/damon/vaddr: respect folio end for DAMOS_MIGRATE_{HOT,COLD}")
>   fa5b61fcf5c9d ("mm/damon/vaddr: remove a debug message")
>   ed6700504e3f5 ("mm/damon: move damon_hugetlb_mkold() from vaddr to ops-common")
>   88ac1f509a7e6 ("mm/damon/vaddr: support prep_probes")
>   68ce5caa141c4 ("mm/damon/vaddr: support apply_probe")
>   45e6bd6ac2868 ("mm/damon/vaddr: extend apply_probes() for hugetlb")
>   4144f08e72a48 ("mm/damon/vaddr: support pgidle_unset probe filter type")
>   6a00e5447c45e ("mm/damon/vaddr: support DAMON_FILTER_TYPE_PGIDLE_SET")
>   3dabc621c0cfd ("mm/damon/core: extend probe_hits_wsum() for moving sum based calculation")
> 
> from the mm tree and commit:

hm, "mm tree" isn't a branch name.  I assume "mm-unstable" was meant.

> 
>   566380a1497eb ("mm/damon/vaddr: avoid hw-driven pte updates during damon_hugetlb_mkold()")
> 
> from the mm-nonmm-unstable tree.
> 

Something went wrong here.  "mm/damon/vaddr: avoid hw-driven pte
updates during damon_hugetlb_mkold()" is in mm-hotfixes-unstable. 
mm-hotfixes-unstable is merged into mm-unstable and mm-nonmm-unstable.