linux-kernel - Re: linux-next: manual merge of the random tree with the mm-stable 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] [day] [month] [year] [list]

Message-ID: <ZqBaF-HJhT7g9Uov@zx2c4.com>
Date: Wed, 24 Jul 2024 03:34:15 +0200
From: "Jason A. Donenfeld" <Jason@...c4.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: torvalds@...ux-foundation.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the random tree with the mm-stable
 tree

Hi Stephen,

On Wed, Jul 24, 2024 at 09:15:54AM +1000, Stephen Rothwell wrote:
> This is now a conflict between the random tree and Linus' tree.

Not too big of a deal, I don't think; I'm just waiting on Linus to pull
the tag I sent last week. Andrew only sent mm this weekend, so I assume
pulling mine is slated for sometime soon after, now that Linus has
pulled the mm patches. So these conflicts should disappear shortly.

Regards,
Jason