Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 May 2015 01:23:53 +0000 (18:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 May 2015 01:23:53 +0000 (18:23 -0700)
commit8663da2c0919896788321cd8a0016af08588c656
tree9e92edcab3fa5187f8af2b02cdc791453b21c8b8
parent101a6fd387801bbe164eafea3950b98f8e6440bb
parent2c869b262a10ca99cb866d04087d75311587a30c
Merge tag 'for_linus_stable' of git://git./linux/kernel/git/tytso/ext4

Pull ext4 fixes from Ted Ts'o:
 "Some miscellaneous bug fixes and some final on-disk and ABI changes
  for ext4 encryption which provide better security and performance"

* tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix growing of tiny filesystems
  ext4: move check under lock scope to close a race.
  ext4: fix data corruption caused by unwritten and delayed extents
  ext4 crypto: remove duplicated encryption mode definitions
  ext4 crypto: do not select from EXT4_FS_ENCRYPTION
  ext4 crypto: add padding to filenames before encrypting
  ext4 crypto: simplify and speed up filename encryption
fs/ext4/ext4.h
fs/ext4/inode.c
fs/ext4/namei.c
fs/ext4/symlink.c