Messages in this thread | | | Date | Tue, 13 May 2014 13:16:16 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the cifs tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/cifs/cifsfs.c between commit 485c4e72d0f1 ("cifs: revalidate mapping prior to satisfying aio_read request") from the cifs tree and commits aad4f8bb42af ("switch simple generic_file_aio_read() users to ->read_iter()") and 3dae8750c368 ("cifs: switch to ->write_iter()") from the vfs tree.
I fixed it up (I dropped the cifs commit, so this will need a better fix ...) and can carry the fix as necessary.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |