From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alasdair G Kergon <agk@redhat•com>,
Mike Snitzer <snitzer@redhat•com>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>
Subject: linux-next: manual merge of the device-mapper tree with the jc_docs tree
Date: Thu, 4 Jul 2019 13:58:05 +1000 [thread overview]
Message-ID: <20190704135805.6b077b57@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1425 bytes --]
Hi all,
Today's linux-next merge of the device-mapper tree got a conflict in:
Documentation/device-mapper/snapshot.rst
between commit:
f0ba43774cea ("docs: convert docs to ReST and rename to *.rst")
from the jc_docs tree and commit:
a8a9f1434a86 ("dm snapshot: add optional discard support features")
from the device-mapper 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/device-mapper/snapshot.rst
index 4c53304e72f1,1810833f6dc6..000000000000
--- a/Documentation/device-mapper/snapshot.rst
+++ b/Documentation/device-mapper/snapshot.rst
@@@ -31,7 -30,8 +31,8 @@@ original data will be saved in the <CO
its visible content unchanged, at least until the <COW device> fills up.
-*) snapshot <origin> <COW device> <persistent?> <chunksize>
+- snapshot <origin> <COW device> <persistent?> <chunksize>
+ [<# feature args> [<arg>]*]
A snapshot of the <origin> block device is created. Changed chunks of
<chunksize> sectors will be stored on the <COW device>. Writes will
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-07-04 3:58 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=20190704135805.6b077b57@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agk@redhat$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=snitzer@redhat$(echo .)com \
/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