]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit029d7792d82a486a3b5531982c60e273cda8ca49
treea95c09d1a00737f2cb86466a1a1770b09d60b71e
parent71f2c216ea3d88ce4ab5fac6fe0231171d308bc7
parente028cfc96f61b232c308981833b0c28ab82cc1c3
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()
fs/ext4/super.c
include/uapi/linux/fs.h