linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miklos Szeredi <miklos@szeredi.hu>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	David Howells <dhowells@redhat.com>
Subject: Re: linux-next: manual merge of the vfs tree with the fuse tree
Date: Mon, 2 Sep 2019 11:00:00 +0200	[thread overview]
Message-ID: <CAJfpeguxmJvCV+PXr=wz5HXONKv4RDmZ1LpYNEqAtvw_smP5Ag@mail.gmail.com> (raw)
In-Reply-To: <20190830130119.446e7389@canb.auug.org.au>

On Fri, Aug 30, 2019 at 5:01 AM Stephen Rothwell <sfr@canb.auug.org.au> 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

  reply	other threads:[~2019-09-02  9:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-30  3:01 linux-next: manual merge of the vfs tree with the fuse tree Stephen Rothwell
2019-09-02  9:00 ` Miklos Szeredi [this message]
2019-09-02 15:10   ` Miklos Szeredi
2019-09-02 15:30     ` Al Viro
2019-09-02 23:23       ` Stephen Rothwell
2019-09-02 23:29         ` Al Viro
  -- strict thread matches above, loose matches on Subject: below --
2020-02-06 22:14 Stephen Rothwell
2019-05-06 23:53 Stephen Rothwell
2019-05-08  1:01 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAJfpeguxmJvCV+PXr=wz5HXONKv4RDmZ1LpYNEqAtvw_smP5Ag@mail.gmail.com' \
    --to=miklos@szeredi.hu \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=stefanha@redhat.com \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).