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

2019-09-02 Thread Al Viro
On Tue, Sep 03, 2019 at 09:23:17AM +1000, Stephen Rothwell wrote: > Hi Al, > > On Mon, 2 Sep 2019 16:30:04 +0100 Al Viro wrote: > > > > ... originals cheerfully dropped; will be gone in today's push to > > vfs.git#for-next. > > Not pushed out yet? Give me about fifteen minutes...

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

2019-09-02 Thread Stephen Rothwell
Hi Al, On Mon, 2 Sep 2019 16:30:04 +0100 Al Viro wrote: > > ... originals cheerfully dropped; will be gone in today's push to > vfs.git#for-next. Not pushed out yet? -- Cheers, Stephen Rothwell pgpC6lmOgb0FJ.pgp Description: OpenPGP digital signature

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

2019-09-02 Thread Al Viro
On Mon, Sep 02, 2019 at 05:10:27PM +0200, Miklos Szeredi wrote: > On Mon, Sep 2, 2019 at 11:00 AM Miklos Szeredi wrote: > > > > On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell > > wrote: > > > > > > Hi all, > > > > > > Today's linux-next merge of the vfs tree got a conflict in: > > > > > > fs

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

2019-09-02 Thread Miklos Szeredi
On Mon, Sep 2, 2019 at 11:00 AM Miklos Szeredi wrote: > > On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell > wrote: > > > > Hi all, > > > > Today's linux-next merge of the vfs tree got a conflict in: > > > > fs/fuse/inode.c > > > > between commit: > > > > 1458e5e9f99a ("fuse: extract fuse_fi

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

2019-09-02 Thread Miklos Szeredi
On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/fuse/inode.c > > between commit: > > 1458e5e9f99a ("fuse: extract fuse_fill_super_common()") > > from the fuse tree and commit: > > 2ad9ab0f7429 ("vfs: C

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

2019-08-29 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/fuse/inode.c between commit: 1458e5e9f99a ("fuse: extract fuse_fill_super_common()") from the fuse tree and commit: 2ad9ab0f7429 ("vfs: Convert fuse to use the new mount API") 48ceb15f98c8 ("vfs: Move the subtype p

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

2019-05-07 Thread Stephen Rothwell
Hi all, On Tue, 7 May 2019 09:53:23 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/fuse/inode.c > > between commit: > > 829f949b6e06 ("fuse: clean up fuse_alloc_inode") > > from the fuse tree and commit: > > 9baf28bbfe

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

2019-05-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/fuse/inode.c between commit: 829f949b6e06 ("fuse: clean up fuse_alloc_inode") from the fuse tree and commit: 9baf28bbfea1 ("fuse: switch to ->free_inode()") from the vfs tree. I fixed it up (see below) and can carr