Linux-Next discussions
 help / color / mirror / Atom feed
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>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Muchun Song <muchun.song@linux.dev>,
	Muchun Song <songmuchun@bytedance.com>
Subject: Re: linux-next: manual merge of the liveupdate tree with the mm-unstable tree
Date: Wed, 29 Jul 2026 17:44:22 +0300	[thread overview]
Message-ID: <amoRxuf7AVgGLl7N@kernel.org> (raw)
In-Reply-To: <20260729001052.72027fbb99b50783476fa7c2@linux-foundation.org>

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@kernel.org> 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 ...
 
> > But if mm-stable is rebased we'd be in a bigger trouble.
> 
> As mentioned, rare.

... and will cross fingers that such rare event won't happen this cycle :) 

-- 
Sincerely yours,
Mike.

  reply	other threads:[~2026-07-29 14:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-28 16:27 linux-next: manual merge of the liveupdate tree with the mm-unstable tree Mark Brown
2026-07-28 17:38 ` Mike Rapoport
2026-07-28 17:56   ` Mark Brown
2026-07-28 20:43   ` Andrew Morton
2026-07-29  6:06     ` Mike Rapoport
2026-07-29  7:10       ` Andrew Morton
2026-07-29 14:44         ` Mike Rapoport [this message]
2026-07-29 20:15           ` Andrew Morton

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=amoRxuf7AVgGLl7N@kernel.org \
    --to=rppt@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=broonie@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=muchun.song@linux.dev \
    --cc=pasha.tatashin@soleen.com \
    --cc=pratyush@kernel.org \
    --cc=songmuchun@bytedance.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox