linux-next: manual merge of the vfs tree with Linus' tree

Mon, 21 Apr 2014 18:18:06 -0700 

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in mm/filemap.c
between commit b59b8cbca629 ("mm: fix new kernel-doc warning in
filemap.c") from Linus' tree and commit cbabd10029a4 ("write_iter
variants of {__,}generic_file_aio_write()") from the vfs tree.

I fixed it up (I used the vfs tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgpaX9KSATukR.pgp
Description: PGP signature

Reply via email to