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-dsm.txt | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

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

diff --git a/Documentation/nvme-dsm.txt b/Documentation/nvme-dsm.txt
index ff658a7..6a2e61a 100644
--- a/Documentation/nvme-dsm.txt
+++ b/Documentation/nvme-dsm.txt
@@ -8,13 +8,14 @@ nvme-dsm - Send NVMe Data Set Management, return results
 SYNOPSIS
 --------
 [verse]
-'nvme dsm' <device>  [ --namespace-id=<nsid> | -n <nsid> ]
-			[ --ctx-attrs=<attribute-list,> | -a <attribute-list,> ]
-			[ --blocks=<nlb-list,> | -b <nlb-list,> ]
-			[ --slbs=<slba-list,> | -s <slba-list,> ]
-			[ --ad | -d ] [ --idw | -w ] [ --idr | -r ]
-			[ --cdw11=<cdw11> | -c <cdw11> ]
-
+'nvme dsm' <device> [--namespace-id=<nsid> | -n <nsid>]
+			[--ctx-attrs=<attribute-list,> | -a <attribute-list,>]
+			[--blocks=<nlb-list,> | -b <nlb-list,>]
+			[--slbs=<slba-list,> | -s <slba-list,>]
+			[--ad=<deallocate> | -d <deallocate>]
+			[--idw=<write> | -w <write>] [--idr=<read> | -r <read>]
+			[--cdw11=<cdw11> | -c <cdw11>]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -73,6 +74,15 @@ OPTIONS
 	All the command command dword 11 attributes. Use exclusive from
 	specifying individual attributes
 
+-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