Re: linux-next: manual merge of the memblock tree with the origin tree

[Mark Brown]

On Thu, Jun 20, 2024 at 04:07:45PM +0000, Gowans, James wrote:
> On Thu, 2024-06-20 at 16:54 +0100, Mark Brown wrote:

> > + 	if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
> > + 		nid = NUMA_NO_NODE;
> > + 
> >  -	/*
> >  -	 * Detect any accidental use of these APIs after slab is ready, as at
> >  -	 * this moment memblock may be deinitialized already and its
> >  -	 * internal data may be destroyed (after execution of memblock_free_all)
> >  -	 */

> This looks like you're deleting the check from the
> memblock_alloc_range()? The intention of
> commit 94ff46de4a738 ("memblock: Move late alloc warning down to phys alloc")
> was to *add* this check here.

Huh, git showed the add/add conflict weirdly then (it looked like an
add/remove) and I wasn't paying enough attention.  Sorry about that.

> Do you have a link where I can see the final repo?
> I'm not seeing it here:
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/mm/memblock.c

The merge is still running, it'll appear whenever -next is released
today.

Attachment: signature.asc
Description: PGP signature