Merging upstream version 2.7.1.

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

1 files changed, 29 insertions, 6 deletions

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

 <div class="verseblock">

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

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

-                              [--nrkey=&lt;nrkey&gt; | -k &lt;nrkey&gt;]

-                              [--rrega=&lt;rrega&gt; | -r &lt;rrega&gt;]

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

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

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

+                        [--nrkey=&lt;nrkey&gt; | -k &lt;nrkey&gt;]

+                        [--rrega=&lt;rrega&gt; | -r &lt;rrega&gt;]

+                        [--cptpl=&lt;cptpl&gt; | -p &lt;cptpl&gt;] [--iekey | -i]

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

 <div class="attribution">

 </div></div>

 </div>

@@ -917,6 +917,29 @@ cellspacing="0" cellpadding="4">
 </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>

@@ -937,7 +960,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>