linux-kernel - Re: linux-next: build failure after merge of the fsverity 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: <e062c6a3-b6ec-4be9-a1d8-c3775e0bd451@sirena.org.uk>
Date: Tue, 3 Feb 2026 17:02:37 +0000
From: Mark Brown <broonie@...nel.org>
To: Christoph Hellwig <hch@....de>
Cc: Eric Biggers <ebiggers@...nel.org>, "Theodore Y. Ts'o" <tytso@....edu>,
	Jaegeuk Kim <jaegeuk@...nel.org>, Chao Yu <chao@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the fsverity tree

On Tue, Feb 03, 2026 at 05:29:13PM +0100, Christoph Hellwig wrote:
> On Tue, Feb 03, 2026 at 01:36:34PM +0000, Mark Brown wrote:
> >  		} else {
> >  			folio_zero_range(folio, offset << PAGE_SHIFT, PAGE_SIZE);
> >  			if (f2fs_need_verity(inode, index) &&

> This also need to be replaced with a

> 			if (vi &&

Thanks, I'll roll that in - I was a bit suspicious of that bit.

> Eric already posted the conflict resultion here:
> 
> https://lore.kernel.org/fsverity/20260203053604.GC15956@lst.de/T/#m291294c1f6b7368d3c426ee47e6d23dc854b3ba6

Looks the same otherwise modulo whitespace changes.

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