linux-kernel - Re: linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes 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: <80a7d335-690b-491e-9b55-d0d1f75fda29@sirena.org.uk>
Date: Thu, 20 Jun 2024 13:50:26 +0100
From: Mark Brown <broonie@...nel.org>
To: Christian Brauner <brauner@...nel.org>
Cc: Jan Kara <jack@...e.cz>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	NeilBrown <neilb@...e.de>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the
 vfs-brauner-fixes tree

On Thu, Jun 20, 2024 at 12:34:17PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/open.c
> 
> between commit:

Sorry, the scripting got confused and didn't start the merge properly so
this should just be noise.

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