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

2017-09-10 Thread Stephen Rothwell
Hi Benjamin, Today's linux-next merge of the aio tree got a conflict in: fs/aio.c between commit: 32ec9f249d65 ("io_getevents: Use timespec64 to represent timeouts") from the vfs tree and commit: eb5263749f68 ("aio: handle integer overflow in io_getevents() timespec usage") from the ai

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

2016-03-15 Thread Benjamin LaHaise
On Tue, Mar 15, 2016 at 05:35:33AM +, Al Viro wrote: > On Mon, Mar 14, 2016 at 11:24:38AM -0400, Benjamin LaHaise wrote: > > On Mon, Mar 14, 2016 at 08:35:23AM +0100, Christoph Hellwig wrote: > > > The aio changes have either been reviewed negatively or not at all. That > > > tree should be d

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

2016-03-15 Thread Benjamin LaHaise
On Tue, Mar 15, 2016 at 05:19:39AM +, Al Viro wrote: > On Tue, Mar 15, 2016 at 05:07:12AM +, Al Viro wrote: > > > There *is* a reason for code review. Or, at least, asking somebody familiar > > with the code you are working with whether some assumption you are making > > is true or false.

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

2016-03-15 Thread Christoph Hellwig
On Mon, Mar 14, 2016 at 11:24:38AM -0400, Benjamin LaHaise wrote: > On Mon, Mar 14, 2016 at 08:35:23AM +0100, Christoph Hellwig wrote: > > The aio changes have either been reviewed negatively or not at all. That > > tree should be dropped. > > That isn't solely your decision. If you have commen

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

2016-03-14 Thread Al Viro
On Mon, Mar 14, 2016 at 11:24:38AM -0400, Benjamin LaHaise wrote: > On Mon, Mar 14, 2016 at 08:35:23AM +0100, Christoph Hellwig wrote: > > The aio changes have either been reviewed negatively or not at all. That > > tree should be dropped. > > That isn't solely your decision. If you have commen

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

2016-03-14 Thread Al Viro
On Tue, Mar 15, 2016 at 05:07:12AM +, Al Viro wrote: > There *is* a reason for code review. Or, at least, asking somebody familiar > with the code you are working with whether some assumption you are making > is true or false. Me, for example, in our conversation regarding earlier > parts >

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

2016-03-14 Thread Al Viro
On Tue, Mar 15, 2016 at 04:34:48AM +, Al Viro wrote: > Incidentally, why the hell has that thing never landed in my mailbox? Not > directly, not Cc'd, not via fsdevel either. > > Ben, what the fuck going on? OK, you don't feel necessary to mention > that to me (or have me take a look throug

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

2016-03-14 Thread Stephen Rothwell
Hi Al, On Tue, 15 Mar 2016 04:34:48 + Al Viro wrote: > > > between commit: > > > > 5955102c9984 ("wrappers for ->i_mutex access") > > > > from the vfs tree and commit: > > What. > > The. > > Hell? > > The first commit is in the mainline, not in vfs tree. And it had been > there since

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

2016-03-14 Thread Al Viro
On Tue, Mar 15, 2016 at 03:06:40PM +1100, Stephen Rothwell wrote: > Hi Ben, > > Today's linux-next merge of the aio tree got a conflict in: > > fs/namei.c > > between commit: > > 5955102c9984 ("wrappers for ->i_mutex access") > > from the vfs tree and commit: > > 5d3d80fcf992 ("aio: add

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

2016-03-14 Thread Stephen Rothwell
Hi Ben, Today's linux-next merge of the aio tree got a conflict in: fs/namei.c between commit: 5955102c9984 ("wrappers for ->i_mutex access") from the vfs tree and commit: 5d3d80fcf992 ("aio: add support for in-submit openat") from the aio tree. I fixed it up (see below) and can carry

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

2016-03-14 Thread Benjamin LaHaise
On Mon, Mar 14, 2016 at 08:35:23AM +0100, Christoph Hellwig wrote: > The aio changes have either been reviewed negatively or not at all. That > tree should be dropped. That isn't solely your decision. If you have comments, please provide constructive feedback, as there are users and use-cases

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

2016-03-14 Thread Christoph Hellwig
The aio changes have either been reviewed negatively or not at all. That tree should be dropped.

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

2016-03-13 Thread Stephen Rothwell
Hi all, On Mon, 14 Mar 2016 15:36:47 +1100 Stephen Rothwell wrote: > > And I forgot this bit :-( And just to show I should be on holidays, this as well :-( From: Stephen Rothwell Date: Mon, 14 Mar 2016 15:38:22 +1100 Subject: [PATCH] vfs: do_loop_readv_writev API merge fix part 3 Signed-off-

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

2016-03-13 Thread Stephen Rothwell
Hi all, On Mon, 14 Mar 2016 15:32:14 +1100 Stephen Rothwell wrote: > > I also added the following merge fix patch: > > From: Stephen Rothwell > 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 > ---

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

2016-03-13 Thread Stephen Rothwell
Hi Benjamin, Today's linux-next merge of the aio tree got a conflict in: fs/read_write.c between commit: 793b80ef14af ("vfs: pass a flags argument to vfs_readv/vfs_writev") from the vfs tree and commit: 4047629ed53e ("fs: make do_loop_readv_writev() non-static") from the aio tree. I f