Hi Al,

Today's linux-next merge of the vfs tree got a conflict in fs/pipe.c
between commit be61a86d7237dd80510615f38ae21d6e1e98660c ("flag
parameters: NONBLOCK in pipe") from Linus' tree and commit
6d865512f04526c702efda424b825ee946e659de ("Re: [PATCH] (resend) reuse
xxx_fifo_fops for xxx_pipe_fops") from the vfs tree.

Just overlapping context changes in create_read_pipe().  I did the
obvious fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/