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]

Date: Thu, 20 Jun 2024 19:00:43 +0100
From: Mark Brown <broonie@...nel.org>
To: "Gowans, James" <jgowans@...zon.com>
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

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.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)