Merging upstream version 2.4+really2.4.

Signed-off-by: Daniel Baumann <daniel@debian.org>

Documentation/nvme-connect-all.html

@@ -759,17 +759,21 @@ nvme-connect-all(1) Manual Page
                 [--hostnqn=<hostnqn>      | -q <hostnqn>]
                 [--hostid=<hostid>        | -I <hostid>]
                 [--raw=<filename>         | -r <filename>]
+                [--device=<device>        | -d <device>]
                 [--cfg-file=<cfg>         | -C <cfg>]
-                [--keep-alive-tmo=<#>     | -k <#>]
+                [--keep-alive-tmo=<sec>   | -k <sec>]
                 [--reconnect-delay=<#>    | -c <#>]
                 [--ctrl-loss-tmo=<#>      | -l <#>]
-                [--hdr-digest             | -g]
-                [--data-digest            | -G]
                 [--nr-io-queues=<#>       | -i <#>]
                 [--nr-write-queues=<#>    | -W <#>]
                 [--nr-poll-queues=<#>     | -P <#>]
                 [--queue-size=<#>         | -Q <#>]
+                [--keyring=<#>                    ]
+                [--tls_key=<#>                    ]
+                [--hdr-digest             | -g]
+                [--data-digest            | -G]
                 [--persistent             | -p]
+                [--tls                        ]
                 [--quiet                  | -S]
                 [--dump-config            | -O]</pre>
 <div class="attribution">
@@ -945,6 +949,20 @@ cellspacing="0" cellpadding="4">
 </p>
 </dd>
 <dt class="hdlist1">
+-d &lt;device&gt;
+</dt>
+<dt class="hdlist1">
+--device=&lt;device&gt;
+</dt>
+<dd>
+<p>
+        This field takes a device as input. It must be a persistent device
+        associated with a Discovery Controller previously created by the
+        command "connect-all" or "discover". &lt;device&gt; follows the format
+        nvme*, eg. nvme0, nvme1.
+</p>
+</dd>
+<dt class="hdlist1">
 -C &lt;cfg&gt;
 </dt>
 <dt class="hdlist1">
@@ -996,28 +1014,6 @@ cellspacing="0" cellpadding="4">
 </p>
 </dd>
 <dt class="hdlist1">
--g
-</dt>
-<dt class="hdlist1">
---hdr-digest
-</dt>
-<dd>
-<p>
-        Generates/verifies header digest (TCP).
-</p>
-</dd>
-<dt class="hdlist1">
--G
-</dt>
-<dt class="hdlist1">
---data-digest
-</dt>
-<dd>
-<p>
-        Generates/verifies data digest (TCP).
-</p>
-</dd>
-<dt class="hdlist1">
 -i &lt;#&gt;
 </dt>
 <dt class="hdlist1">
@@ -1066,6 +1062,44 @@ cellspacing="0" cellpadding="4">
 </p>
 </dd>
 <dt class="hdlist1">
+--keyring=&lt;#&gt;
+</dt>
+<dd>
+<p>
+        Keyring for TLS key lookup.
+</p>
+</dd>
+<dt class="hdlist1">
+--tls_key=&lt;#&gt;
+</dt>
+<dd>
+<p>
+        TLS key for the connection (TCP).
+</p>
+</dd>
+<dt class="hdlist1">
+-g
+</dt>
+<dt class="hdlist1">
+--hdr-digest
+</dt>
+<dd>
+<p>
+        Generates/verifies header digest (TCP).
+</p>
+</dd>
+<dt class="hdlist1">
+-G
+</dt>
+<dt class="hdlist1">
+--data-digest
+</dt>
+<dd>
+<p>
+        Generates/verifies data digest (TCP).
+</p>
+</dd>
+<dt class="hdlist1">
 -p
 </dt>
 <dt class="hdlist1">
@@ -1078,6 +1112,14 @@ cellspacing="0" cellpadding="4">
 </p>
 </dd>
 <dt class="hdlist1">
+--tls
+</dt>
+<dd>
+<p>
+        Enable TLS encryption (TCP).
+</p>
+</dd>
+<dt class="hdlist1">
 -S
 </dt>
 <dt class="hdlist1">
@@ -1156,7 +1198,7 @@ nvme-connect(1)</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-01-30 14:14:16 CET
+ 2023-03-31 16:17:28 CEST
 </div>
 </div>
 </body>