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-set-property.html b/Documentation/nvme-set-property.html
index 3686ef5..0be4250 100644
--- a/Documentation/nvme-set-property.html
+++ b/Documentation/nvme-set-property.html
@@ -751,7 +751,8 @@ nvme-set-property(1) Manual Page
 <div class="verseblock">

 <pre class="content"><em>nvme set-property</em> &lt;device&gt; [--offset=&lt;offset&gt; | -O &lt;offset&gt;]

                         [--value=&lt;val&gt; | -V &lt;val&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>

@@ -811,6 +812,17 @@ nvme-set-property(1) Manual Page
         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>

@@ -831,7 +843,7 @@ nvme-set-property(1) Manual Page
 <div id="footer">

 <div id="footer-text">

 Last updated

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

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

 </div>

 </div>

 </body>