From: "Gowans, James" <jgowans@amazon•com>
To: "broonie@kernel•org" <broonie@kernel•org>
Cc: "linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"jbeulich@suse•com" <jbeulich@suse•com>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"rppt@kernel•org" <rppt@kernel•org>
Subject: Re: linux-next: manual merge of the memblock tree with the origin tree
Date: Thu, 20 Jun 2024 17:59:05 +0000 [thread overview]
Message-ID: <e6f1bf73d13060635520c70df269c0b390352f37.camel@amazon.com> (raw)
In-Reply-To: <db13f2b7-88da-42db-85ed-d78cdd5f6c62@sirena.org.uk>
On Thu, 2024-06-20 at 17:13 +0100, Mark Brown wrote:
> 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.
Looking at today's -next:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/mm/memblock.c?h=next-20240620#n1434
I think this check did indeed accidentally get deleted in the merge.
We're expecting the diff in this commit to be present:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/mm/memblock.c?h=next-20240620&id=94ff46de4a738e7916b68ab5cc0b0380729f02af
... but the merge commit appears to have the deleting part but not the
adding part:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/mm/memblock.c?h=next-20240620&id=42781bf9ef85d3d259ec345f3c4e6a5a8b8add64
Correct me if I'm wrong, but it looks like the if statement only got
deleted and not moved, so this would need to be re-worked.
JG
next prev parent reply other threads:[~2024-06-20 17:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 15:54 linux-next: manual merge of the memblock tree with the origin tree Mark Brown
2024-06-20 16:07 ` Gowans, James
2024-06-20 16:13 ` Mark Brown
2024-06-20 17:59 ` Gowans, James [this message]
2024-06-20 18:00 ` Mark Brown
2024-06-21 20:08 ` Gowans, James
2024-06-21 20:30 ` Mark Brown
2024-06-24 5:53 ` Mike Rapoport
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=e6f1bf73d13060635520c70df269c0b390352f37.camel@amazon.com \
--to=jgowans@amazon$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=jbeulich@suse$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rppt@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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