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-download.html b/Documentation/nvme-fw-download.html
index cc49e87..68cc9a3 100644
--- a/Documentation/nvme-fw-download.html
+++ b/Documentation/nvme-fw-download.html
@@ -752,7 +752,8 @@ nvme-fw-download(1) Manual Page
 <pre class="content"><em>nvme fw-download</em> &lt;device&gt; [--fw=&lt;firmware-file&gt; | -f &lt;firmware-file&gt;]

                         [--xfer=&lt;transfer-size&gt; | -x &lt;transfer-size&gt;]

                         [--offset=&lt;offset&gt; | -O &lt;offset&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>

@@ -846,6 +847,17 @@ the Firmware Commit command (nvme fw-commit &lt;args&gt;).</p></div>
         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>

@@ -876,7 +888,7 @@ Transfer a firmware size 128KiB at a time:
 <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>