From: Linus Torvalds Date: Wed, 11 Nov 2009 19:28:11 +0000 (-0800) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 X-Git-Tag: firefly_0821_release~11946 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16fe4101ae265e908615702806ee3b28ab1c8370;p=firefly-linux-kernel-4.4.55.git Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: partial revert to fix double brelse WARNING() ext4: Fix return value of ext4_split_unwritten_extents() to fix direct I/O ext4: code clean up for dio fallocate handling ext4: skip conversion of uninit extents after direct IO if there isn't any ext4: fix ext4_ext_direct_IO()'s return value after converting uninit extents ext4: discard preallocation when restarting a transaction during truncate --- 16fe4101ae265e908615702806ee3b28ab1c8370