From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Feb 2021 18:25:24 +0000 (-0800)
Subject: Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
X-Git-Tag: v5.12-rc1~161
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7b36dc5cb37615b568b7161ddc53d604973ec8b;p=linux-platform-drivers-x86.git

Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

Pull fsverity updates from Eric Biggers:
 "Add an ioctl which allows reading fs-verity metadata from a file.

  This is useful when a file with fs-verity enabled needs to be served
  somewhere, and the other end wants to do its own fs-verity compatible
  verification of the file. See the commit messages for details.

  This new ioctl has been tested using new xfstests I've written for it"

* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fs-verity: support reading signature with ioctl
  fs-verity: support reading descriptor with ioctl
  fs-verity: support reading Merkle tree with ioctl
  fs-verity: add FS_IOC_READ_VERITY_METADATA ioctl
  fs-verity: don't pass whole descriptor to fsverity_verify_signature()
  fs-verity: factor out fsverity_get_descriptor()
---

f7b36dc5cb37615b568b7161ddc53d604973ec8b