]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge ext4 changes in ext4_file_write() into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 6 May 2014 21:38:41 +0000 (17:38 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 6 May 2014 21:38:41 +0000 (17:38 -0400)
From ext4.git#dev, needed for switch of ext4 to ->write_iter() ;-/

1  2 
fs/ext4/ext4.h
fs/ext4/file.c
fs/ext4/inode.c

diff --cc fs/ext4/ext4.h
Simple merge
diff --cc fs/ext4/file.c
Simple merge
diff --cc fs/ext4/inode.c
Simple merge