Re: linux-next: build failure after merge of the fsverity tree

[Mark Brown]

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@xxxxxx/T/#m291294c1f6b7368d3c426ee47e6d23dc854b3ba6

Looks the same otherwise modulo whitespace changes.

Attachment: signature.asc
Description: PGP signature