From: Christoph Hellwig <hch@lst.de>
To: Mark Brown <broonie@kernel.org>
Cc: Eric Biggers <ebiggers@kernel.org>,
"Theodore Y. Ts'o" <tytso@mit.edu>,
Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>,
Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the fsverity tree
Date: Tue, 3 Feb 2026 17:29:13 +0100 [thread overview]
Message-ID: <20260203162913.GA28595@lst.de> (raw)
In-Reply-To: <aYH54qJee85qLLkN@sirena.org.uk>
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/20260203053604.GC15956@lst.de/T/#m291294c1f6b7368d3c426ee47e6d23dc854b3ba6
and I independently verified it.
next prev parent reply other threads:[~2026-02-03 16:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-03 13:36 linux-next: build failure after merge of the fsverity tree Mark Brown
2026-02-03 16:29 ` Christoph Hellwig [this message]
2026-02-03 17:02 ` Mark Brown
2026-02-04 17:39 ` kernel test robot
2026-02-04 17:39 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260203162913.GA28595@lst.de \
--to=hch@lst.de \
--cc=broonie@kernel.org \
--cc=chao@kernel.org \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.