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

On Tue, Jul 28, 2026 at 01:43:33PM -0700, Andrew Morton wrote:
> On Tue, 28 Jul 2026 20:38:54 +0300 Mike Rapoport <[email protected]> wrote:
> 
> > I've got this for merging mm-unstable into liveupdate/next:
> > 
> > diff --cc mm/hugetlb.c
> > index ab4afc818e8cb,a77c3c1cb8943..0000000000000
> > --- a/mm/hugetlb.c
> > +++ b/mm/hugetlb.c
> 
> Well that's a pain.

Once resolved it stops being a pain :)

> 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.
But if mm-stable is rebased we'd be in a bigger trouble.

Ideally we'd have a stable branch in mm tree that only contains "mm:
Refactor bootmem gigantic hugepage allocation" series and then this branch
would be easily merged into mm-stable and into liveupdate tree.

I'm going to keep liveupdate tree as it is for a couple of days and when
Pratyush sends the updated version we can resync again.

-- 
Sincerely yours,
Mike.