linux-next: manual merge of the aio-direct tree with the vfs tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the aio-direct tree got a conflict in
drivers/mtd/nand/nandsim.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 just used the aio-direct tree version) and can carry the
fix as necessary (no action is required).

There may be some question as to whether file_readable() needs to check
its filp argument for NULL, but that would require auditing all its call
sites.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature