diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 18:22:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 18:22:31 -0800 |
| commit | 6c24337f22115d669e24ce990842dab667371b4d (patch) | |
| tree | 44c41adb55182c4fe833935f3b346ed7ad7e29ca /MAINTAINERS | |
| parent | 786856b6d111a30d51c98526cc7a283ecc73f00f (diff) | |
| parent | 6f69f0ed6136c302976f8e8f859b73d47f0c0c5c (diff) | |
| download | linux-6c24337f22115d669e24ce990842dab667371b4d.tar.gz | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypt updates from Ted Ts'o: "Various cleanups for the file system encryption feature" * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt: fscrypt: constify struct fscrypt_operations fscrypt: properly declare on-stack completion fscrypt: split supp and notsupp declarations into their own headers fscrypt: remove redundant assignment of res fscrypt: make fscrypt_operations.key_prefix a string fscrypt: remove unused 'mode' member of fscrypt_ctx ext4: don't allow encrypted operations without keys fscrypt: make test_dummy_encryption require a keyring key fscrypt: factor out bio specific functions fscrypt: pass up error codes from ->get_context() fscrypt: remove user-triggerable warning messages fscrypt: use EEXIST when file already uses different policy fscrypt: use ENOTDIR when setting encryption policy on nondirectory fscrypt: use ENOKEY when file cannot be created w/o key
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index baac725ce1ff..80f1a5894411 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5281,7 +5281,7 @@ M: Jaegeuk Kim <jaegeuk@kernel.org> L: linux-fsdevel@vger.kernel.org S: Supported F: fs/crypto/ -F: include/linux/fscrypto.h +F: include/linux/fscrypt*.h F2FS FILE SYSTEM M: Jaegeuk Kim <jaegeuk@kernel.org> |