Subject: linux-next: manual merge of the fuse tree with the fsverity tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 30 Aug 2019 11:34:19 +1000

Hi all,

Today's linux-next merge of the fuse tree got a conflict in:

  Documentation/filesystems/index.rst

between commit:

  6ff2deb2e8f6 ("fs-verity: add a documentation file")

from the fsverity tree and commit:

  709dc8bf7f48 ("virtio-fs: add Documentation/filesystems/virtiofs.rst")

from the fuse tree.

I fixed it up (see below) 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

diff --cc Documentation/filesystems/index.rst
index 54f2c6aac187,56e94bfc580f..000000000000
--- a/Documentation/filesystems/index.rst
+++ b/Documentation/filesystems/index.rst
@@@ -32,4 -32,13 +32,14 @@@ filesystem implementations
  
     journalling
     fscrypt
 +   fsverity
+ 
+ Filesystems
+ ===========
+ 
+ Documentation for filesystem implementations.
+ 
+ .. toctree::
+    :maxdepth: 2
+ 
+    virtiofs