]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Mar 2020 19:58:36 +0000 (12:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Mar 2020 19:58:36 +0000 (12:58 -0700)
commitbeb89e8f7e67914eee4713fbcb946272170c926a
tree6a574f2ce6e53e7c384fd8333bbaefd8a49f9350
parent5d8538c48593cad8f6f8b4538b863a0303364007
parent293668db6b325291e79b8ebd8a04ca11c007e917
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/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
fs/crypto/keysetup.c