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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <9262bfba5d65c603dcad49a75e5a30564f75c3d4.camel@amazon.com>
Date: Fri, 21 Jun 2024 20:08:53 +0000
From: "Gowans, James" <jgowans@...zon.com>
To: "broonie@...nel.org" <broonie@...nel.org>
CC: "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"jbeulich@...e.com" <jbeulich@...e.com>, "linux-kernel@...r.kernel.org"
	<linux-kernel@...r.kernel.org>, "rppt@...nel.org" <rppt@...nel.org>
Subject: Re: linux-next: manual merge of the memblock tree with the origin tree

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