lkml.org 
[lkml]   [2013]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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 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@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-11-11 03:41    [W:0.458 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site