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 parameter into fuse")
from the vfs tree.
This is too much to work out, so I have effectively reverted the 2 vfs
tree commits.
I fixed it up (see above) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell <[email protected]> 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: Convert fuse to use the new mount API")
> 48ceb15f98c8 ("vfs: Move the subtype parameter into fuse")
And the latter is b0rked anyway.
Al, please drop these patches from the VFS queue, I'll take (and fix)
them through the fuse queue.
Thanks,
Miklos
On Mon, Sep 2, 2019 at 11:00 AM Miklos Szeredi <[email protected]> wrote:
>
> On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell <[email protected]> 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: Convert fuse to use the new mount API")
> > 48ceb15f98c8 ("vfs: Move the subtype parameter into fuse")
>
> And the latter is b0rked anyway.
Both, actually.
Pushed fixed ones to fuse.git#for-next.
Thanks,
Miklos
On Mon, Sep 02, 2019 at 05:10:27PM +0200, Miklos Szeredi wrote:
> On Mon, Sep 2, 2019 at 11:00 AM Miklos Szeredi <[email protected]> wrote:
> >
> > On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell <[email protected]> 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: Convert fuse to use the new mount API")
> > > 48ceb15f98c8 ("vfs: Move the subtype parameter into fuse")
> >
> > And the latter is b0rked anyway.
>
> Both, actually.
>
> Pushed fixed ones to fuse.git#for-next.
... originals cheerfully dropped; will be gone in today's push to
vfs.git#for-next.
Hi Al,
On Mon, 2 Sep 2019 16:30:04 +0100 Al Viro <[email protected]> wrote:
>
> ... originals cheerfully dropped; will be gone in today's push to
> vfs.git#for-next.
Not pushed out yet?
--
Cheers,
Stephen Rothwell
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 <[email protected]> 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...