From: Mike Rapoport <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Mark Brown <broonie@kernel.org>,
Pasha Tatashin <pasha.tatashin@soleen.com>,
Pratyush Yadav <pratyush@kernel.org>,
David Hildenbrand <david@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mikhail Zaslonko <zaslonko@linux.ibm.com>,
Usama Arif <usama.arif@linux.dev>,
Vlastimil Babka <vbabka@kernel.org>
Subject: Re: linux-next: manual merge of the kexec tree with the mm tree
Date: Tue, 17 Nov 2026 15:24:36 +0200 [thread overview]
Message-ID: <avxVlNG_ZYLetc98@kernel.org> (raw)
In-Reply-To: <20261116114201.71afd94ec31717433939e1fe@linux-foundation.org>
On Mon, Nov 16, 2026 at 11:42:01AM -0800, Andrew Morton wrote:
> On Mon, 16 Nov 2026 19:25:56 +0000 Mark Brown <broonie@kernel.org> wrote:
>
> > Today's linux-next merge of the kexec tree got a conflict in:
> >
> > kernel/crash_reserve.c
> >
> > between commit:
> >
> > ed27d3cb114dd ("mm/hugetlb: allow crashkernel to reuse hugetlb CMA memory")
> >
> > from the mm tree and commit:
> >
> > 941aef93e9e1d ("kdump: Give crashkernel CMA areas unique names")
> >
> > from the kexec tree.
>
> OK, thanks. I'll send Usama's "mm/hugetlb: allow crashkernel to reuse
> hugetlb CMA memory" to kexec people then I shall forget all about it ;)
Right, until the next conflict :)
--
Sincerely yours,
Mike.
prev parent reply other threads:[~2026-11-17 13:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 19:25 linux-next: manual merge of the kexec tree with the mm tree Mark Brown
2026-11-16 19:42 ` Andrew Morton
2026-11-17 13:24 ` Mike Rapoport [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=avxVlNG_ZYLetc98@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=david@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pasha.tatashin@soleen.com \
--cc=pratyush@kernel.org \
--cc=usama.arif@linux.dev \
--cc=vbabka@kernel.org \
--cc=zaslonko@linux.ibm.com \
/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.