Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 30 Aug 2019 13:01:19 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Al Viro <viro@ZenIV.linux.org.uk>,
        Miklos Szeredi <miklos@szeredi.hu>
Cc:     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: linux-next: manual merge of the vfs tree with the fuse tree
Message-ID: <20190830130119.446e7389@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Tn=2ZLbKUMqhULSfKru47vA";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/Tn=2ZLbKUMqhULSfKru47vA
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/Tn=2ZLbKUMqhULSfKru47vA
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1okX8ACgkQAVBC80lX
0GzQuwf/bnDmW+NPdNxJXTcgZ9hm3O+JmDYt53J7xpjGVs8/t1oI5lki5r2r6iwJ
5VlrVmIy6q90RSSNbXrPcjEitdi/sNuTyYsQw9gG5NBs7VkxQAneQnCQEmG26Gss
LPBjkh1Mxtp90I5s12PJPBvlOiC2H++sqwpEfQalJFHQZU5Q5Uuzs8u8yjiLJZJD
io8n+aM1K1XSMYKTC60fnwgWT8sT7H4sqYLHqPuZmnmR0eJqxw6+JUp+zQpXuBUz
pAFBrGT1cypjbw75hrYIt7uu8UawpIUZ4Sx/AZVteOF5GaM2EoOl6bP0EoSkNzbL
tGEJOxtnzhSeOiAeKrS4FM8yPDCs5A==
=t/LM
-----END PGP SIGNATURE-----

--Sig_/Tn=2ZLbKUMqhULSfKru47vA--