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-admin-passthru.txt | 46 +++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'Documentation/nvme-admin-passthru.txt')

diff --git a/Documentation/nvme-admin-passthru.txt b/Documentation/nvme-admin-passthru.txt
index 5a20ff8..22559db 100644
--- a/Documentation/nvme-admin-passthru.txt
+++ b/Documentation/nvme-admin-passthru.txt
@@ -8,23 +8,24 @@ nvme-admin-passthru - Submit an arbitrary admin command, return results
 SYNOPSIS
 --------
 [verse]
-'nvme-admin-passthru' <device> [--opcode=<opcode> | -o <opcode>]
-		[--flags=<flags> | -f <flags>] [-rsvd=<rsvd> | -R <rsvd>]
-		[--namespace-id=<nsid> | -n <nsid>] [--cdw2=<cdw2> | -2 <cdw2>]
-		[--cdw3=<cdw3> | -3 <cdw3>] [--cdw10=<cdw10> | -4 <cdw4>]
-		[--cdw11=<cdw11> | -5 <cdw5>] [--cdw12=<cdw12> | -6 <cdw6>]
-		[--cdw13=<cdw13> | -7 <cdw7>] [--cdw14=<cdw14> | -8 <cdw8>]
-		[--cdw15=<cdw15> | -9 <cdw9>]
-		[--data-len=<data-len> | -l <data-len>]
-		[--metadata-len=<len> | -m <len>]
-		[--input-file=<file> | -i <file>]
-		[--read | -r ] [--write | -w]
-		[--timeout=<to> | -t <to>]
-		[--show-command | -s]
-		[--dry-run | -d]
-		[--raw-binary | -b]
-		[--prefill=<prefill> | -p <prefill>]
-		[--latency | -T]
+'nvme-admin-passthru' <device> [--opcode=<opcode> | -O <opcode>]
+			[--flags=<flags> | -f <flags>] [-rsvd=<rsvd> | -R <rsvd>]
+			[--namespace-id=<nsid> | -n <nsid>] [--cdw2=<cdw2> | -2 <cdw2>]
+			[--cdw3=<cdw3> | -3 <cdw3>] [--cdw10=<cdw10> | -4 <cdw4>]
+			[--cdw11=<cdw11> | -5 <cdw5>] [--cdw12=<cdw12> | -6 <cdw6>]
+			[--cdw13=<cdw13> | -7 <cdw7>] [--cdw14=<cdw14> | -8 <cdw8>]
+			[--cdw15=<cdw15> | -9 <cdw9>]
+			[--data-len=<data-len> | -l <data-len>]
+			[--metadata-len=<len> | -m <len>]
+			[--input-file=<file> | -i <file>]
+			[--read | -r] [--write | -w]
+			[--timeout=<to> | -t <to>]
+			[--show-command | -s]
+			[--dry-run | -d]
+			[--raw-binary | -b]
+			[--prefill=<prefill> | -p <prefill>]
+			[--latency | -T]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -43,7 +44,7 @@ printed to stdout for another program to parse.
 
 OPTIONS
 -------
--o <opcode>::
+-O <opcode>::
 --opcode=<opcode>::
 	The NVMe opcode to send to the device in the command
 
@@ -113,6 +114,15 @@ OPTIONS
 --latency::
 	Print out the latency the IOCTL took (in us).
 
+-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
 --------
 * The following will run the admin command with opcode=6 and cdw10=1, which
-- 
cgit v1.2.3