Re: linux-next: manual merge of the liveupdate tree with the mm-unstable tree

[Andrew Morton]

On Wed, 29 Jul 2026 17:44:22 +0300 Mike Rapoport <rppt@xxxxxxxxxx> wrote:

> On Wed, Jul 29, 2026 at 12:10:52AM -0700, Andrew Morton wrote:
> > On Wed, 29 Jul 2026 09:06:57 +0300 Mike Rapoport <rppt@xxxxxxxxxx> wrote:
> > 
> > > > I'll get the series "mm: Refactor bootmem gigantic
> > > > hugepage allocation" into mm-stable in the next couple of days.  Can we
> > > > then make this issue go away?
> > > 
> > > I can base the conflicting KHO work on mm-stable.
> > 
> > It's pushed out now.  Basing on 6d098029de09 ("mm/mm_init: fold
> > __init_page_from_nid() into __init_deferred_page()") would capture all
> > of Muchun's "mm: Refactor bootmem gigantic hugepage allocation".
> 
> I'll apply the next version from Pratyush on this ...

I added a mm-stable-6d098029de09 branch if that helps at all.