From 66e4b69042cd3b44acd42f1fad2109180c1bc48b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 24 Dec 2023 08:57:54 +0100
Subject: Merging upstream version 2.7.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Documentation/nvme-copy.txt | 52 +++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 16 deletions(-)

(limited to 'Documentation/nvme-copy.txt')

diff --git a/Documentation/nvme-copy.txt b/Documentation/nvme-copy.txt
index 1fad952..7c5fb0e 100644
--- a/Documentation/nvme-copy.txt
+++ b/Documentation/nvme-copy.txt
@@ -11,6 +11,8 @@ SYNOPSIS
 'nvme-copy' <device> [--sdlba=<sdlba> | -d <sdlba>]
 			[--blocks=<nlb-list,> | -b <nlb-list,>]
 			[--slbs=<slbas,> | -s <slbas,>]
+			[--snsids=<snsids,> | -N <snsids,>]
+			[--sopts=<sopts,> | -O <sopts,>]
 			[--limited-retry | -l]
 			[--force-unit-access | -f]
 			[--prinfow=<prinfow> | -p <prinfow>]
@@ -24,6 +26,7 @@ SYNOPSIS
 			[--dir-type=<type> | -T <type>]
 			[--dir-spec=<spec> | -S <spec>]
 			[--format=<entry-format> | -F <entry-format>]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -32,76 +35,93 @@ logical block ranges to a single consecutive destination logical block range.
 
 OPTIONS
 -------
---sdlba=<sdlba>::
 -d <sdlba>::
+--sdlba=<sdlba>::
 	64-bit addr of first destination logical block
 
---blocks=<nlb-list,>::
 -b <nlb-list,>::
+--blocks=<nlb-list,>::
 	Comma separated list of the number of blocks in each range
 
---slbs=<slbas,>::
 -s <slbas,>::
+--slbs=<slbas,>::
 	Comma separated list of the starting blocks in each range
 
---limited-retry::
+--snsids=<snsids,>::
+-N <snsids,>::
+	Comma separated list of the source namespace identifiers in each range
+
+--sopts=<sopts,>::
+-O <sopts,>::
+	Comma separated list of the source options in each range
+
 -l::
+--limited-retry::
 	Sets the limited retry flag.
 
---force-unit-access::
 -f::
+--force-unit-access::
 	Set the force-unit access flag.
 
---prinfow=<prinfow>::
 -p <prinfow>::
+--prinfow=<prinfow>::
 	Protection Information field write definition.
 
---prinfor=<prinfor>::
 -P <prinfor>::
+--prinfor=<prinfor>::
 	Protection Information field read definition.
 
---ref-tag=<reftag>::
 -r <reftag>::
+--ref-tag=<reftag>::
 	initial lba reference tag.
 
---expected-ref-tags=<reftag,>::
 -R <reftag,>::
+--expected-ref-tags=<reftag,>::
 	expected lba reference tags (comma-separated list).
 
---app-tag=<apptag>::
 -a <apptag>::
+--app-tag=<apptag>::
 	lba app tag
 
---expected-app-tags=<apptag,>::
 -A <apptag,>::
+--expected-app-tags=<apptag,>::
 	expected lba app tags (comma-separated list)
 
---app-mask=<appmask>::
 -m <appmask>::
+--app-mask=<appmask>::
 	lba tag mask
 
---expected-app-masks=<appmask,>::
 -M <appmask,>::
+--expected-app-masks=<appmask,>::
 	expected lba tag masks (comma-separated list)
 
---dir-type=<type>::
 -T <type>::
+--dir-type=<type>::
 	Optional directive type. The nvme-cli only enforces the value
 	be in the defined range for the directive type, though the NVMe
 	specification (1.3a) defines only one directive, 01h, for write
 	stream identifiers.
 
---dir-spec=<spec>::
 -S <spec>::
+--dir-spec=<spec>::
 	Optional field for directive specifics. When used with
 	write streams, this value is defined to be the write stream
 	identifier. The nvme-cli will not validate the stream requested
 	is within the controller's capabilities.
 
---format=<entry-format>::
 -F <entry-format>::
+--format=<entry-format>::
 	source range entry format
 
+-o <fmt>::
+--output-format=<fmt>::
+	Set the reporting format to 'normal', 'json' or 'binary'. Only one
+	output format can be used at a time.
+
+-v::
+--verbose::
+	Increase the information detail in the output.
+
 EXAMPLES
 --------
 No examples yet.
-- 
cgit v1.2.3