From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Jul 2017 16:03:31 +0000 (-0700)
Subject: Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=58f587cb0b603de3d8869e021d4fa704e065afa8;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'fscrypt_for_linus' of git://git./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()
---

58f587cb0b603de3d8869e021d4fa704e065afa8