From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Feb 2023 20:29:27 +0000 (-0800)
Subject: Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f18f9845f2f10d3d1fc63e4ad16ee52d2d9292fa;p=linux.git

Merge tag 'fscrypt-for-linus' of git://git./fs/fscrypt/linux

Pull fscrypt updates from Eric Biggers:
 "Simplify the implementation of the test_dummy_encryption mount option
  by adding the 'test dummy key' on-demand"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
  fscrypt: clean up fscrypt_add_test_dummy_key()
  fs/super.c: stop calling fscrypt_destroy_keyring() from __put_super()
  f2fs: stop calling fscrypt_add_test_dummy_key()
  ext4: stop calling fscrypt_add_test_dummy_key()
  fscrypt: add the test dummy encryption key on-demand
---

f18f9845f2f10d3d1fc63e4ad16ee52d2d9292fa