Hi all, On Mon, 14 Mar 2016 15:32:14 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > I also added the following merge fix patch: > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Mon, 14 Mar 2016 15:28:05 +1100 > Subject: [PATCH] vfs: do_loop_readv_writev() API change merge fix > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > --- > fs/internal.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/internal.h b/fs/internal.h > index 3bbe63d5eb5e..39f6e9831c5f 100644 > --- a/fs/internal.h > +++ b/fs/internal.h > @@ -139,7 +139,7 @@ extern long prune_dcache_sb(struct super_block *sb, struct shrink_control *sc); > */ > extern int rw_verify_area(int, struct file *, const loff_t *, size_t); > extern ssize_t do_loop_readv_writev(struct file *filp, struct iov_iter *iter, > - loff_t *ppos, io_fn_t fn); > + loff_t *ppos, io_fn_t fn, int flags); > > > /* And I forgot this bit :-( From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Mon, 14 Mar 2016 15:34:17 +1100 Subject: [PATCH] vfs: do_loop_readv_writev API merge fix up part 2 Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- fs/aio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/aio.c b/fs/aio.c index b079cb65a90f..d2dd7d482ffe 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1576,7 +1576,7 @@ static long aio_thread_op_read_iter(struct aio_kiocb *iocb) } else if (filp->f_op->read) ret = do_loop_readv_writev(filp, &iocb->ki_iter, &iocb->common.ki_pos, - filp->f_op->read); + filp->f_op->read, 0); else ret = -EINVAL; unuse_mm(iocb->ki_ctx->mm); -- 2.7.0 -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
