Messages in this thread | | | Date | Mon, 11 Nov 2013 12:58:23 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the aio-direct tree with the vfs tree |
| |
Hi Dave,
Today's linux-next merge of the aio-direct tree got a conflict in fs/read_write.c between commit 72c2d5319200 ("file->f_op is never NULL...") from the vfs tree and commit dd458300240b ("fs: create file_readable() and file_writable() functions") from the aio-direct tree.
I fixed it up (I used the aio-direct tree version) 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] | |