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

[Andrew Morton]

On Tue, 19 May 2026 10:32:26 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:
> 
>   mm/hugetlb_cma.c
> 
> between commits:
> 
>   8f5ce56b76303 ("mm/hugetlb_cma: round up per_node before logging it")
>   4d33b7a0c04bf ("mm/hugetlb_cma: restrict hugetlb_cma parameter to gigantic-page alignment")
> 
> from the origin tree

Actually these are in mm.git.

The first was in mm-hotfixes-stable and is now in mainline.

The second remains in mm-unstable.

> and commit:
> 
>   2638c879e1082 ("mm/hugetlb_cma: round up per_node before logging it")
> 
> from the mm-nonmm-unstable tree.

This duplicate was in mm-hotfixes-stable, now upstream;

> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

Or something like that ;)  I guess there's a timing issue here, it should all
come good soon.