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

[Mike Rapoport]

On Wed, Sep 02, 2026 at 11:20:09AM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:
> 
>   mm/secretmem.c
> 
> between commits:
> 
>   0d171c47f2be6 ("mm/secretmem: properly account locked pages")
>   a31a4988ca3e8 ("set_memory: add number of pages parameter to set_direct_map APIs")
> 
> from the mm,mm-fixes tree and commit:
> 
>   d2c5e077cbeaf ("mm/secretmem: properly account locked pages")
> 
> from the mm-nonmm-unstable tree.
> 
> 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.

Thanks, Mark!
 
-- 
Sincerely yours,
Mike.