From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Nov 2021 18:36:35 +0000 (-0700)
Subject: Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
X-Git-Tag: microblaze-v5.18~683
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=cd3e8ea847eea97095aa01de3d12674d35fd0199;p=linux-2.6-microblaze.git

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
---

cd3e8ea847eea97095aa01de3d12674d35fd0199