Merging upstream version 2.10.

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

1 files changed, 14 insertions, 2 deletions

diff --git a/Documentation/nvme-fw-commit.html b/Documentation/nvme-fw-commit.html
index 772d658..39ac136 100644
--- a/Documentation/nvme-fw-commit.html
+++ b/Documentation/nvme-fw-commit.html
@@ -752,7 +752,8 @@ nvme-fw-commit(1) Manual Page
 <pre class="content"><em>nvme fw-commit</em> &lt;device&gt; [--slot=&lt;slot&gt; | -s &lt;slot&gt;]

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

                         [--bpid=&lt;boot-partid&gt; | -b &lt;boot-partid&gt;]

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

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

+                        [--timeout=&lt;timeout&gt; | -t &lt;timeout&gt;]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -893,6 +894,17 @@ BPINFO.ABPID.</p></td>
         Increase the information detail in the output.

 </p>

 </dd>

+<dt class="hdlist1">

+-t &lt;timeout&gt;

+</dt>

+<dt class="hdlist1">

+--timeout=&lt;timeout&gt;

+</dt>

+<dd>

+<p>

+        Override default timeout value. In milliseconds.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -929,7 +941,7 @@ commit the last downloaded fw to slot 1.
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2024-05-03 16:03:16 CEST

+ 2024-08-02 09:57:44 CEST

 </div>

 </div>

 </body>