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

From: Christoph Hellwig <[email-masked]>
Date: Tue, 3 Feb 2026 17:29:13 +0100

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 &&

Eric already posted the conflict resultion here:

https://lore.kernel.org/fsverity/[email-masked]/T/#m291294c1f6b7368d3c426ee47e6d23dc854b3ba6

and I independently verified it.