Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Jul 2017 16:03:31 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Jul 2017 16:03:31 +0000 (09:03 -0700)
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()

1  2 
fs/ext4/super.c
include/uapi/linux/fs.h

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