Merging upstream version 2.10.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/Documentation/nvme-connect.html b/Documentation/nvme-connect.html
index 0b13a38..36511d7 100644
--- a/Documentation/nvme-connect.html
+++ b/Documentation/nvme-connect.html
@@ -768,7 +768,7 @@ nvme-connect(1) Manual Page
                         [--reconnect-delay=<#> | -c <#>]

                         [--ctrl-loss-tmo=<#> | -l <#>] [--tos=<#> | -T <#>]

                         [--keyring=<#>] [--tls_key=<#>]

-                        [--duplicate-connect | -D] [--disable-sqflow | -d]

+                        [--duplicate-connect | -D] [--disable-sqflow ]

                         [--hdr-digest | -g] [--data-digest | -G] [--tls]

                         [--concat] [--dump-config | -O] [--application=<id>]

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

@@ -1039,6 +1039,8 @@ cellspacing="0" cellpadding="4">
 <dd>

 <p>

         Overrides the default controller loss timeout period (in seconds).

+        This is the maximum time the kernel will retry a connection, where each

+        retry will be issued after <em>reconnect-delay</em> seconds.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1081,9 +1083,6 @@ cellspacing="0" cellpadding="4">
 </p>

 </dd>

 <dt class="hdlist1">

--d

-</dt>

-<dt class="hdlist1">

 --disable-sqflow

 </dt>

 <dd>

@@ -1219,7 +1218,7 @@ and <a href="mailto:hch@lst.de">Christoph Hellwig</a></p></div>
 <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>