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

[Andrew Morton]

On Wed, 2 Sep 2026 13:13:47 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> On Wed, Sep 02, 2026 at 03:06:09PM +0300, Mike Rapoport wrote:
> > On Wed, Sep 02, 2026 at 11:20:09AM +0100, Mark Brown wrote:
> 
> > > between commits:
> 
> > >   0d171c47f2be6 ("mm/secretmem: properly account locked pages")
> 
> > > from the mm,mm-fixes tree and commit:
> 
> > >   d2c5e077cbeaf ("mm/secretmem: properly account locked pages")
> 
> > > from the mm-nonmm-unstable tree.
> 
> > Thanks, Mark!
> 
> There's some more duplicated commits here BTW.

I'm not sure what's going on here.

Yesterday I rebuilt/rebased mm-hotfixes-stable because stupidhead had
gone and put a merge commit in there (this triggers Linus).  Rebuilt
all branches based on that.  Then at some point (when?) this was all
moved into mm-next.

So shudder.  Hopefully it'll all sort itself out tomorrow.