Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jan 2024 18:24:49 +0000 (10:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jan 2024 18:24:49 +0000 (10:24 -0800)
commit17b9e388c619ea4f1eae97833cdcadfbfe041650
treec887b1fd3e3d069aacdbbf130492af828645b0c8
parent49f4810356f7d4294ad63dc70fe3c65ca3b8ada9
parent2a0e85719892a1d63f8f287563e2c1778a77879e
Merge tag 'fscrypt-for-linus' of git://git./fs/fscrypt/linux

Pull fscrypt updates from Eric Biggers:
 "Adjust the timing of the fscrypt keyring destruction, to prepare for
  btrfs's fscrypt support.

  Also document that CephFS supports fscrypt now"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
  fs: move fscrypt keyring destruction to after ->put_super
  f2fs: move release of block devices to after kill_block_super()
  fscrypt: document that CephFS supports fscrypt now
  fscrypt: update comment for do_remove_key()
  fscrypt.rst: update definition of struct fscrypt_context_v2
fs/super.c