Merging upstream version 2.7.1.

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

1 files changed, 30 insertions, 7 deletions

diff --git a/Documentation/nvme-resv-acquire.html b/Documentation/nvme-resv-acquire.html
index fbbd31d..3d8e876 100644
--- a/Documentation/nvme-resv-acquire.html
+++ b/Documentation/nvme-resv-acquire.html
@@ -750,11 +750,11 @@ nvme-resv-acquire(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>nvme resv-acquire</em> &lt;device&gt; [--namespace-id=&lt;nsid&gt; | -n &lt;nsid&gt;]

-                             [--crkey=&lt;crkey&gt; | -c &lt;crkey&gt;]

-                             [--prkey=&lt;prkey&gt; | -p &lt;prkey&gt;]

-                             [--rtype=&lt;rtype&gt; | -t &lt;rtype&gt;]

-                             [--racqa=&lt;racqa&gt; | -a &lt;racqa&gt;]

-                             [--iekey | -i]</pre>

+                        [--crkey=&lt;crkey&gt; | -c &lt;crkey&gt;]

+                        [--prkey=&lt;prkey&gt; | -p &lt;prkey&gt;]

+                        [--rtype=&lt;rtype&gt; | -t &lt;rtype&gt;]

+                        [--racqa=&lt;racqa&gt; | -a &lt;racqa&gt;] [--iekey | -i]

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

 <div class="attribution">

 </div></div>

 </div>

@@ -924,10 +924,33 @@ cellspacing="0" cellpadding="4">
 <p>

         Ignore Existing Key: If this bit is set to a <em>1</em>, then the

         Current Reservation Key (CRKEY) check is disabled and the command

-        shall succeed regardless of the CRKEY field  value.

+        shall succeed regardless of the CRKEY field value.

 </p>

 <div class="paragraph"><p>Indicator option, defaults to <em>0</em>.</p></div>

 </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>

@@ -948,7 +971,7 @@ cellspacing="0" cellpadding="4">
 <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>