Merging upstream version 2.7.1.

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

1 files changed, 28 insertions, 5 deletions

diff --git a/Documentation/nvme-io-mgmt-send.html b/Documentation/nvme-io-mgmt-send.html
index a625024..a0df7b0 100644
--- a/Documentation/nvme-io-mgmt-send.html
+++ b/Documentation/nvme-io-mgmt-send.html
@@ -750,10 +750,10 @@ nvme-io-mgmt-send(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>nvme io-mgmt-send</em> &lt;device&gt; [--namespace-id=&lt;NUM&gt; | -n &lt;NUM&gt;]

-                             [--mos=&lt;NUM&gt; | -s &lt;NUM&gt;]

-                             [--mo=&lt;NUM&gt; | -m &lt;NUM&gt;]

-                             [--data=&lt;FILE&gt; | -d &lt;FILE&gt;]

-                             [--data-len=&lt;NUM&gt; | -l &lt;NUM&gt;]</pre>

+                        [--mos=&lt;NUM&gt; | -s &lt;NUM&gt;] [--mo=&lt;NUM&gt; | -m &lt;NUM&gt;]

+                        [--data=&lt;FILE&gt; | -d &lt;FILE&gt;]

+                        [--data-len=&lt;NUM&gt; | -l &lt;NUM&gt;]

+                        [--output-format=&lt;fmt&gt; | -o &lt;fmt&gt;] [--verbose | -v]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -831,6 +831,29 @@ convenience parameters to produce the binary payload.</p></div>
         Management Operation Specific parameter.

 </p>

 </dd>

+<dt class="hdlist1">

+-o &lt;fmt&gt;

+</dt>

+<dt class="hdlist1">

+--output-format=&lt;fmt&gt;

+</dt>

+<dd>

+<p>

+        Set the reporting format to <em>normal</em>, <em>json</em> or <em>binary</em>. Only one

+        output format can be used at a time.

+</p>

+</dd>

+<dt class="hdlist1">

+-v

+</dt>

+<dt class="hdlist1">

+--verbose

+</dt>

+<dd>

+<p>

+        Increase the information detail in the output.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -845,7 +868,7 @@ convenience parameters to produce the binary payload.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-06-30 15:20:22 CEST

+ 2023-12-21 15:49:29 CET

 </div>

 </div>

 </body>