Merging upstream version 2.7.1.

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

1 files changed, 22 insertions, 11 deletions

diff --git a/Documentation/nvme-get-lba-status.html b/Documentation/nvme-get-lba-status.html
index c1a03a4..e739871 100644
--- a/Documentation/nvme-get-lba-status.html
+++ b/Documentation/nvme-get-lba-status.html
@@ -750,12 +750,12 @@ nvme-get-lba-status(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

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

-                    [--start-lba=&lt;slba&gt; | -s &lt;slba&gt;]

-                    [--max-dw=&lt;max-dw&gt; | -m &lt;max-dw&gt;]

-                    [--action=&lt;action-type&gt; | -a &lt;action-type&gt;]

-                    [--range-len=&lt;range-len&gt; | -l &lt;range-len&gt;]

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

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

+                        [--start-lba=&lt;slba&gt; | -s &lt;slba&gt;]

+                        [--max-dw=&lt;max-dw&gt; | -m &lt;max-dw&gt;]

+                        [--action=&lt;action-type&gt; | -a &lt;action-type&gt;]

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

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

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

 <div class="attribution">

 </div></div>

 </div>

@@ -846,15 +846,26 @@ printed to stdout for another program to parse.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

--o &lt;format&gt;

+-o &lt;fmt&gt;

 </dt>

 <dt class="hdlist1">

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

+--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.

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

@@ -896,7 +907,7 @@ Get LBA Status of the namespace 1 from SLBA 10 for the max Dwords of 0x1000
 <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>