]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Feb 2023 20:29:27 +0000 (12:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Feb 2023 20:29:27 +0000 (12:29 -0800)
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

1  2 
fs/crypto/policy.c
fs/super.c

Simple merge
diff --cc fs/super.c
Simple merge