Messages in this thread | | | Date | Tue, 22 Apr 2014 11:13:42 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the ext4 tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/ext4/file.c between rebased commits from the ext4 tree and commit 29a8196bc41c ("convert ext4 to ->write_iter()") from the vfs tree.
I fixed it up (in this case I used the conflicting hunks from the vfs tree - I hope its right) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |