[lkml]   [2019]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the vfs tree with the fuse tree
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: 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.


 \ /
  Last update: 2019-09-02 11:01    [W:0.086 / U:13.236 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site