From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Jan 2024 18:24:49 +0000 (-0800)
Subject: Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
X-Git-Tag: v6.8-rc1~149
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=17b9e388c619ea4f1eae97833cdcadfbfe041650;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:
 "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
---

17b9e388c619ea4f1eae97833cdcadfbfe041650