From: Andrew Morton <akpm@linux-foundation•org>
To: Mark Brown <broonie@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sang-Heon Jeon <ekffu200098@gmail•com>
Subject: Re: linux-next: manual merge of the mm-nonmm-unstable tree with the origin tree
Date: Tue, 19 May 2026 11:25:43 -0700 [thread overview]
Message-ID: <20260519112543.bcb64b65bd264dc0eebac362@linux-foundation.org> (raw)
In-Reply-To: <agwuKp3CtmlA8t4n@sirena.org.uk>
On Tue, 19 May 2026 10:32:26 +0100 Mark Brown <broonie@kernel•org> 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.
next prev parent reply other threads:[~2026-05-19 18:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-19 9:32 linux-next: manual merge of the mm-nonmm-unstable tree with the origin tree Mark Brown
2026-05-19 18:25 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-02-23 13:15 Mark Brown
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=20260519112543.bcb64b65bd264dc0eebac362@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=ekffu200098@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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