From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Mar 2024 20:17:36 +0000 (-0700)
Subject: Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
X-Git-Tag: for-linus-6.9~368
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3bf95d567d67f8d78d7d2c8553025eaa02e1d9c5;p=users%2Fdwmw2%2Flinux.git

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

Pull fscrypt updates from Eric Biggers:
 "Fix flakiness in a test by releasing the quota synchronously when a
  key is removed, and other minor cleanups"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
  fscrypt: shrink the size of struct fscrypt_inode_info slightly
  fscrypt: write CBC-CTS instead of CTS-CBC
  fscrypt: clear keyring before calling key_put()
  fscrypt: explicitly require that inode->i_blkbits be set
---

3bf95d567d67f8d78d7d2c8553025eaa02e1d9c5