Merging upstream version 2.7.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 35 insertions, 20 deletions

diff --git a/Documentation/nvme-admin-passthru.1 b/Documentation/nvme-admin-passthru.1
index 4929a23..38fbba7 100644
--- a/Documentation/nvme-admin-passthru.1
+++ b/Documentation/nvme-admin-passthru.1
@@ -2,12 +2,12 @@
 .\"     Title: nvme-admin-passthru
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/30/2023
+.\"      Date: 12/21/2023
 .\"    Manual: NVMe Manual
 .\"    Source: NVMe
 .\"  Language: English
 .\"
-.TH "NVME\-ADMIN\-PASSTHR" "1" "06/30/2023" "NVMe" "NVMe Manual"
+.TH "NVME\-ADMIN\-PASSTHR" "1" "12/21/2023" "NVMe" "NVMe Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -32,23 +32,24 @@ nvme-admin-passthru \- Submit an arbitrary admin command, return results
 .SH "SYNOPSIS"
 .sp
 .nf
-\fInvme\-admin\-passthru\fR <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]
+\fInvme\-admin\-passthru\fR <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]
 .fi
 .SH "DESCRIPTION"
 .sp
@@ -59,7 +60,7 @@ The <device> parameter is mandatory and may be either the NVMe character device
 On success, the returned structure (if applicable) may be returned in one of several ways depending on the option flags; the structure may printed by the program as a hex dump, or may be returned as a raw buffer printed to stdout for another program to parse\&.
 .SH "OPTIONS"
 .PP
-\-o <opcode>, \-\-opcode=<opcode>
+\-O <opcode>, \-\-opcode=<opcode>
 .RS 4
 The NVMe opcode to send to the device in the command
 .RE
@@ -131,6 +132,20 @@ Prefill the buffer with a predetermined byte value\&. Defaults to 0\&. This may
 .RS 4
 Print out the latency the IOCTL took (in us)\&.
 .RE
+.PP
+\-o <fmt>, \-\-output\-format=<fmt>
+.RS 4
+Set the reporting format to
+\fInormal\fR,
+\fIjson\fR
+or
+\fIbinary\fR\&. Only one output format can be used at a time\&.
+.RE
+.PP
+\-v, \-\-verbose
+.RS 4
+Increase the information detail in the output\&.
+.RE
 .SH "EXAMPLES"
 .sp
 .RS 4