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

From: "Gowans, James" <[email-masked]>
Date: Fri, 21 Jun 2024 20:08:53 +0000

Hi Mark,

On Thu, 2024-06-20 at 19:00 +0100, Mark Brown wrote:
> On Thu, Jun 20, 2024 at 05:59:05PM +0000, Gowans, James wrote:
> 
> > 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.
> 
> Yes, the merge in -next is wrong.

What's the next step to fix the incorrect merge commit?
Looking at today's -next I see the same issue:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/mm/memblock.c?h=next-20240621&id=f689ee4c062317a0831fbffeeb30d7816608b2e7

JG