Merging upstream version 1.15.

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

1 files changed, 45 insertions, 8 deletions

diff --git a/Documentation/nvme-get-log.html b/Documentation/nvme-get-log.html
index 9aa20e0..53af505 100644
--- a/Documentation/nvme-get-log.html
+++ b/Documentation/nvme-get-log.html
@@ -750,13 +750,16 @@ nvme-get-log(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>nvme get-log</em> &lt;device&gt; [--log-id=&lt;log-id&gt; | -i &lt;log-id&gt;]

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

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

-                      [--namespace-id=&lt;nsid&gt; | -n &lt;nsid&gt;]

-                      [--raw-binary | -b]

-                      [--lpo=&lt;offset&gt; | -o &lt;offset&gt;]

-                      [--lsp=&lt;field&gt; | -s &lt;field&gt;]

-                      [--rae | -r]</pre>

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

+                [--aen=&lt;aen&gt; | -a &lt;aen&gt;]

+                [--namespace-id=&lt;nsid&gt; | -n &lt;nsid&gt;]

+                [--raw-binary | -b]

+                [--lpo=&lt;offset&gt; | -o &lt;offset&gt;]

+                [--lsp=&lt;field&gt; | -s &lt;field&gt;]

+                [--lsi=&lt;field&gt; | -S &lt;field&gt;]

+                [--rae | -r]

+                [--csi=&lt;command_set_identifier&gt; | -y &lt;command_set_identifier&gt;]

+                [--ot | -O]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -864,6 +867,17 @@ program to parse.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+-S &lt;field&gt;

+</dt>

+<dt class="hdlist1">

+--lsi=&lt;field&gt;

+</dt>

+<dd>

+<p>

+        The log specified field of Log Specific Identifier.

+</p>

+</dd>

+<dt class="hdlist1">

 -r

 </dt>

 <dt class="hdlist1">

@@ -874,6 +888,29 @@ program to parse.</p></div>
         Retain an Asynchronous Event.

 </p>

 </dd>

+<dt class="hdlist1">

+-y &lt;command_set_identifier&gt;

+</dt>

+<dt class="hdlist1">

+--csi=&lt;command_set_identifier&gt;

+</dt>

+<dd>

+<p>

+        This field specifies the identifier of command set.

+        if not issued, NVM Command Set will be selected.

+</p>

+</dd>

+<dt class="hdlist1">

+-O

+</dt>

+<dt class="hdlist1">

+--ot

+</dt>

+<dd>

+<p>

+        Offset Type

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -918,7 +955,7 @@ Have the program return the raw log page in binary:
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2019-09-18 00:00:58 JST

+ 2021-06-12 14:47:50 IST

 </div>

 </div>

 </body>