From: Mike Rapoport <rppt@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.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 15:06:09 +0300 [thread overview]
Message-ID: <apgRMUMN6DVFmJ8u@kernel.org> (raw)
In-Reply-To: <apf4WaZ8D0P6W-FX@sirena.org.uk>
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.
next prev parent reply other threads:[~2026-09-02 12:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-02 10:20 linux-next: manual merge of the mm-nonmm-unstable tree with the mm,mm-fixes tree 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 [this message]
2026-09-02 12:13 ` Mark Brown
2026-09-02 21:00 ` Andrew Morton
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=apgRMUMN6DVFmJ8u@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ljs@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.