Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jan 2015 22:05:40 +0000 (14:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jan 2015 22:05:40 +0000 (14:05 -0800)
Pull ext4 bugfixes from Ted Ts'o:
 "Revert a potential seek_data/hole regression which shows up when using
  ext4 to handle ext3 file systems, plus two minor bug fixes"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: remove spurious KERN_INFO from ext4_warning call
  Revert "ext4: fix suboptimal seek_{data,hole} extents traversial"
  ext4: prevent online resize with backup superblock

1  2 
fs/ext4/super.c

diff --cc fs/ext4/super.c
Simple merge