tree a28bfcf2889b9a49b21edc51e44a0acf7bc2beb7
parent cbcb9b5bc9804c2e803f00a460c212f9a0bbdb0d
parent 8c62f31eddb71c6f6878258579318c1156045247
author Linus Torvalds <torvalds@linux-foundation.org> 1710274656 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1710274656 -0700
mergetag object 8c62f31eddb71c6f6878258579318c1156045247
 type commit
 tag fscrypt-for-linus
 tagger Eric Biggers <ebiggers@google.com> 1710215644 -0700
 
 fscrypt updates for 6.9
 
 Fix flakiness in a test by releasing the quota synchronously when a key
 is removed, and other minor cleanups.
 -----BEGIN PGP SIGNATURE-----
 
 iIoEABYIADIWIQSacvsUNc7UX4ntmEPzXCl4vpKOKwUCZe/STxQcZWJpZ2dlcnNA
 Z29vZ2xlLmNvbQAKCRDzXCl4vpKOKyVAAQCJQr5l3fU+rm1FVpuVg8q/pbPdi5wJ
 N31pYFvY3AehtQEArdPNtBbXW3V7i9OL6CDmesuNtGr3Il5KRV1h89yyYgY=
 =RGab
 -----END PGP SIGNATURE-----

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