* linux-next: manual merge of the device-mapper tree with the jc_docs tree
@ 2019-07-04 3:58 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-07-04 3:58 UTC (permalink / raw)
To: Alasdair G Kergon, Mike Snitzer, Jonathan Corbet
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Mauro Carvalho Chehab
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-07-04 3:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-04 3:58 linux-next: manual merge of the device-mapper tree with the jc_docs tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox