]> 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)
commit646520750fd684099903188e47daadef54bf6d60
treea95c09d1a00737f2cb86466a1a1770b09d60b71e
parentebc4637b3f60a97fb09c582c515849e77ea64868
parent4f76f29628e375c920f1763e59b8090179c0102d
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