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-verify.txt | 47 ++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 19 deletions(-)

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

diff --git a/Documentation/nvme-verify.txt b/Documentation/nvme-verify.txt
index 3c8039a..01dabbf 100644
--- a/Documentation/nvme-verify.txt
+++ b/Documentation/nvme-verify.txt
@@ -9,16 +9,16 @@ SYNOPSIS
 --------
 [verse]
 'nvme-verify' <device> [--namespace-id=<nsid> | -n <nsid>]
-            [--start-block=<slba> | -s <slba>]
-            [--block-count=<nlb> | -c <nlb>]
-            [--limited-retry | -l]
-            [--force-unit-access | -f]
-            [--prinfo=<prinfo> | -p <prinfo>]
-            [--ref-tag=<reftag> | -r <reftag>]
-            [--app-tag-mask=<appmask> | -m <appmask>]
-            [--app-tag=<apptag> | -a <apptag>]
-            [--storage-tag<storage-tag> | -S <storage-tag>]
-            [--storage-tag-check | -C]
+			[--start-block=<slba> | -s <slba>]
+			[--block-count=<nlb> | -c <nlb>] [--limited-retry | -l]
+			[--force-unit-access | -f]
+			[--prinfo=<prinfo> | -p <prinfo>]
+			[--ref-tag=<reftag> | -r <reftag>]
+			[--app-tag-mask=<appmask> | -m <appmask>]
+			[--app-tag=<apptag> | -a <apptag>]
+			[--storage-tag<storage-tag> | -S <storage-tag>]
+			[--storage-tag-check | -C]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -27,28 +27,28 @@ reading data and metadata.
 
 OPTIONS
 -------
---namespace-id=<nsid>::
 -n <nsid>::
+--namespace-id=<nsid>::
 	Namespace ID use in the command.
 
---start-block=<slba>::
 -s <slba>::
+--start-block=<slba>::
 	Start block address.
 
---block-count=<nlb>::
 -c <nlb>::
+--block-count=<nlb>::
 	Number of logical blocks to Verify.
 
---limited-retry::
 -l::
+--limited-retry::
 	Sets the limited retry flag.
 
---force-unit-access::
 -f::
+--force-unit-access::
 	Set the force-unit access flag.
 
---prinfo=<prinfo>::
 -p <prinfo>::
+--prinfo=<prinfo>::
 	Protection Information field definition.
 +
 []
@@ -63,16 +63,16 @@ metadata is passes.
 |0|Set to 1 enables checking the reference tag
 |=================
 
---ref-tag=<reftag>::
 -r <reftag>::
+--ref-tag=<reftag>::
 	Optional reftag when used with protection information.
 
---app-tag-mask=<appmask>::
 -m <appmask>::
+--app-tag-mask=<appmask>::
 	Optional application tag mask when used with protection information.
 
---app-tag=<apptag>::
 -a <apptag>::
+--app-tag=<apptag>::
 	Optional application tag when used with protection information.
 
 -S <storage-tag>::
@@ -83,6 +83,15 @@ metadata is passes.
 --storage-tag-check::
 	This flag enables Storage Tag field checking as part of Verify operation.
 
+-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