Merge tag 'ext4_for_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Nov 2016 02:33:50 +0000 (18:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Nov 2016 02:33:50 +0000 (18:33 -0800)
commitd117b9acaeada0b243f31e0fe83e111fcc9a6644
tree3ba4fefa66b461127523bef71f2472b28e6d4342
parent50d438fb9e4229cb37ec89a22c066b626e30885c
parent8cdf3372fe8368f56315e66bea9f35053c418093
Merge tag 'ext4_for_stable' of git://git./linux/kernel/git/tytso/ext4

Pull ext4 fixes from Ted Ts'o:
 "A security fix (so a maliciously corrupted file system image won't
  panic the kernel) and some fixes for CONFIG_VMAP_STACK"

* tag 'ext4_for_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: sanity check the block and cluster size at mount time
  fscrypto: don't use on-stack buffer for key derivation
  fscrypto: don't use on-stack buffer for filename encryption