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

On Mon, Nov 11, 2013 at 12:53:28PM +1100, Stephen Rothwell wrote: > 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 > fil

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

On Mon, 11 Nov 2013 12:53:28 +1100 Stephen Rothwell wrote: > > 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. Ignore that ... -- Cheers, Stephen Rothwells...@canb.au

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

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 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 fixe