Re: linux-next: manual merge of the kexec tree with the mm tree
From: Mike Rapoport
Date: Tue Nov 17 2026 - 08:24:54 EST
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@xxxxxxxxxx> 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.