Merging upstream version 2.7.1.

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

1 files changed, 17 insertions, 6 deletions

diff --git a/Documentation/nvme-smart-log.html b/Documentation/nvme-smart-log.html
index 5c62ef2..31e7615 100644
--- a/Documentation/nvme-smart-log.html
+++ b/Documentation/nvme-smart-log.html
@@ -751,7 +751,7 @@ nvme-smart-log(1) Manual Page
 <div class="verseblock">

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

                         [--raw-binary | -b]

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

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

 <div class="attribution">

 </div></div>

 </div>

@@ -799,15 +799,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>

@@ -850,7 +861,7 @@ Print the raw SMART log to a file:
 <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>