Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Nov 2021 18:36:35 +0000 (11:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Nov 2021 18:36:35 +0000 (11:36 -0700)
commitcd3e8ea847eea97095aa01de3d12674d35fd0199
tree309b8c609c7f8f606169405d91c6b77f9feacaa7
parent19901165d90fdca1e57c9baa0d5b4c63d15c476a
parentb7e072f9b77f4c516df96e0c22ec09f8b2e76ba1
Merge tag 'fscrypt-for-linus' of git://git./fs/fscrypt/fscrypt

Pull fscrypt updates from Eric Biggers:
 "Some cleanups for fs/crypto/:

   - Allow 256-bit master keys with AES-256-XTS

   - Improve documentation and comments

   - Remove unneeded field fscrypt_operations::max_namelen"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fscrypt: improve a few comments
  fscrypt: allow 256-bit master keys with AES-256-XTS
  fscrypt: improve documentation for inline encryption
  fscrypt: clean up comments in bio.c
  fscrypt: remove fscrypt_operations::max_namelen
Documentation/block/inline-encryption.rst
fs/ext4/super.c