diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-09 09:03:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-09 09:03:31 -0700 |
commit | 58f587cb0b603de3d8869e021d4fa704e065afa8 (patch) | |
tree | a95c09d1a00737f2cb86466a1a1770b09d60b71e /fs/ext4/fsmap.h | |
parent | e28e9e3ec016a4850f3169ae3e7ec02f90a259fe (diff) | |
parent | c250b7dd8e73b5f7d88d231fbaac92e3360a7234 (diff) |
Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypt updates from Ted Ts'o:
"Add support for 128-bit AES and some cleanups to fscrypt"
* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
fscrypt: make ->dummy_context() return bool
fscrypt: add support for AES-128-CBC
fscrypt: inline fscrypt_free_filename()
Diffstat (limited to 'fs/ext4/fsmap.h')
0 files changed, 0 insertions, 0 deletions