On Mon, Dec 28, 2020 at 11:12:07AM -0800, Eric Biggers wrote: > Backport four commits from v5.11-rc1. I resolved conflicts in the first > two. > > Eric Biggers (4): > fscrypt: add fscrypt_is_nokey_name() > ext4: prevent creating duplicate encrypted filenames > f2fs: prevent creating duplicate encrypted filenames > ubifs: prevent creating duplicate encrypted filenames > > fs/crypto/hooks.c | 10 +++++----- > fs/ext4/namei.c | 3 +++ > fs/f2fs/f2fs.h | 2 ++ > fs/ubifs/dir.c | 17 +++++++++++++---- > include/linux/fscrypt_notsupp.h | 5 +++++ > include/linux/fscrypt_supp.h | 29 +++++++++++++++++++++++++++++ > 6 files changed, 57 insertions(+), 9 deletions(-) > > -- > 2.29.2 > All now queued up, thanks. greg k-h
