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

[Miklos Szeredi]

On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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