From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miklos Szeredi <miklos@szeredi•hu>,
Eric Biggers <ebiggers@kernel•org>,
"Theodore Y. Ts'o" <tytso@mit•edu>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Stefan Hajnoczi <stefanha@redhat•com>
Subject: linux-next: manual merge of the fuse tree with the fsverity tree
Date: Fri, 30 Aug 2019 11:34:19 +1000 [thread overview]
Message-ID: <20190830113419.7e647876@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-08-30 1:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190830113419.7e647876@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ebiggers@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=stefanha@redhat$(echo .)com \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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