From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Mike Rapoport <rppt@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lorenzo Stoakes <ljs@kernel.org>
Subject: Re: linux-next: manual merge of the mm-nonmm-unstable tree with the mm,mm-fixes tree
Date: Wed, 2 Sep 2026 14:00:23 -0700 [thread overview]
Message-ID: <20260902140023.1ad32ff3c2147b99b49b28c0@linux-foundation.org> (raw)
In-Reply-To: <b76cab9b-8e50-4d84-8b93-8d1161542689@sirena.org.uk>
On Wed, 2 Sep 2026 13:13:47 +0100 Mark Brown <broonie@kernel.org> 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.
prev parent reply other threads:[~2026-09-02 21:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-02 10:20 Mark Brown
2026-09-02 11:12 ` Lorenzo Stoakes (ARM)
2026-09-02 11:19 ` Mark Brown
2026-09-02 12:06 ` Mike Rapoport
2026-09-02 12:06 ` Mike Rapoport
2026-09-02 12:13 ` Mark Brown
2026-09-02 21:00 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260902140023.1ad32ff3c2147b99b49b28c0@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ljs@kernel.org \
--cc=rppt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®