Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 May 2015 22:55:31 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 May 2015 22:55:31 +0000 (15:55 -0700)
commit6a8098a447206f8d2ce3954271657b6d79911d51
tree71fd4f7a414c20c6ea304ee3ffb7c5a9dbcbc87c
parentc7309e88a694acbe9e42655f02b9dd37c7931424
parentb9576fc3624eb9fc88bec0d0ae883fd78be86239
Merge tag 'for_linus_stable' of git://git./linux/kernel/git/tytso/ext4

Pull ext4 fixes from Ted Ts'o:
 "Fix a number of ext4 bugs; the most serious of which is a bug in the
  lazytime mount optimization code where we could end up updating the
  timestamps to the wrong inode"

* tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix an ext3 collapse range regression in xfstests
  jbd2: fix r_count overflows leading to buffer overflow in journal recovery
  ext4: check for zero length extent explicitly
  ext4: fix NULL pointer dereference when journal restart fails
  ext4: remove unused function prototype from ext4.h
  ext4: don't save the error information if the block device is read-only
  ext4: fix lazytime optimization