From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Mar 2020 19:58:36 +0000 (-0700)
Subject: Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
X-Git-Tag: v5.10.7~2958
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1455c69900c8c6442b182a74087931f4ffb1cac4;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'fscrypt-for-linus' of git://git./fs/fscrypt/fscrypt

Pull fscrypt updates from Eric Biggers:
 "Add an ioctl FS_IOC_GET_ENCRYPTION_NONCE which retrieves a file's
  encryption nonce.

  This makes it easier to write automated tests which verify that
  fscrypt is doing the encryption correctly"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE
  fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl
---

1455c69900c8c6442b182a74087931f4ffb1cac4