Hi Benjamin, After merging the aio tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/aio.c: In function 'aio_kernel_init_rw': fs/aio.c:1359:6: error: 'struct kiocb' has no member named 'ki_left' iocb->ki_left = nr; ^ fs/aio.c: In function 'aio_kernel_submit': fs/aio.c:1394:6: error: 'struct kiocb' has no member named 'ki_opcode' iocb->ki_opcode = op; ^ fs/aio.c:1395:6: error: 'struct kiocb' has no member named 'ki_buf' iocb->ki_buf = (char __user *)(unsigned long)ptr; ^ fs/aio.c:1398:2: error: too few arguments to function 'aio_run_iocb' ret = aio_run_iocb(iocb, 0); ^ fs/aio.c:1217:16: note: declared here static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode, ^ Caused by commit af9fa2024c38 ("aio: add aio_kernel_() interface") from the aio-direct tree interacting with commit 8bc92afcf7f5 ("aio: Kill unneeded kiocb members") from the aio tree. I applied the following merge fix patch (and I can carry it as necessary - thanks, Dave, for the hint patches): From: Stephen Rothwell Date: Wed, 21 Aug 2013 17:42:14 +1000 Subject: [PATCH] aio: semantic fixup Signed-off-by: Stephen Rothwell --- fs/aio.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 39fb7b0..59b46cd 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1356,7 +1356,6 @@ void aio_kernel_init_rw(struct kiocb *iocb, struct file *filp, size_t nr, loff_t off) { iocb->ki_filp = filp; - iocb->ki_left = nr; iocb->ki_nbytes = nr; iocb->ki_pos = off; iocb->ki_ctx = (void *)-1; @@ -1391,11 +1390,7 @@ int aio_kernel_submit(struct kiocb *iocb, unsigned short op, void *ptr) BUG_ON(!iocb->ki_obj.complete); BUG_ON(!iocb->ki_filp); - iocb->ki_opcode = op; - iocb->ki_buf = (char __user *)(unsigned long)ptr; - iocb->ki_iter = ptr; - - ret = aio_run_iocb(iocb, 0); + ret = aio_run_iocb(iocb, op, ptr, 0); if (ret) aio_kernel_free(iocb); -- 1.8.4.rc3 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au