Merging upstream version 2.7.1.

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

1 files changed, 29 insertions, 19 deletions

diff --git a/Documentation/nvme-persistent-event-log.html b/Documentation/nvme-persistent-event-log.html
index f960bea..618a192 100644
--- a/Documentation/nvme-persistent-event-log.html
+++ b/Documentation/nvme-persistent-event-log.html
@@ -750,9 +750,8 @@ persistent-event-log(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>nvme persistent-event-log</em> &lt;device&gt; [--action=&lt;action&gt; | -a &lt;action&gt;]

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

-            [--raw-binary | -b]

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

+                        [--log-len=&lt;log-len&gt; | -l &lt;log-len&gt;] [--raw-binary | -b]

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

 <div class="attribution">

 </div></div>

 </div>

@@ -782,12 +781,12 @@ may be printed to stdout for another program to parse.</p></div>
 </dt>

 <dd>

 <p>

-    While try to retrieve this log action the controller shall take

-    during processing this persistent log page command. This mandatory

-    field, based on the value issued it may Read Log Data, Establish

-    Context and Read Log Data or Release Context can occur. For More

-    details see NVM Express 1.4 Spec. Section 5.14.1.13 Persistent

-    Event Log (Log Identifier 0Dh)

+        While try to retrieve this log action the controller shall take

+        during processing this persistent log page command. This mandatory

+        field, based on the value issued it may Read Log Data, Establish

+        Context and Read Log Data or Release Context can occur. For More

+        details see NVM Express 1.4 Spec. Section 5.14.1.13 Persistent

+        Event Log (Log Identifier 0Dh)

 </p>

 </dd>

 <dt class="hdlist1">

@@ -798,10 +797,10 @@ may be printed to stdout for another program to parse.</p></div>
 </dt>

 <dd>

 <p>

-    Allocates a buffer of &lt;log-len&gt; bytes size and requests this

-    many bytes be returned in the constructed NVMe command. This

-    param is mandatory. If &lt;log-len&gt; given is 0 and action is 0,

-    it will read the Total Log Length(TLL) of the page.

+        Allocates a buffer of &lt;log-len&gt; bytes size and requests this

+        many bytes be returned in the constructed NVMe command. This

+        param is mandatory. If &lt;log-len&gt; given is 0 and action is 0,

+        it will read the Total Log Length(TLL) of the page.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -812,19 +811,30 @@ may be printed to stdout for another program to parse.</p></div>
 </dt>

 <dd>

 <p>

-    Print the raw persistent event log buffer to stdout.

+        Print the raw persistent event log buffer to stdout.

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

@@ -867,7 +877,7 @@ Print the raw persistent event 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>