From 4db51231d9338c31a1182fcb225e9fd7f57db258 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 3 Apr 2023 09:59:55 +0200
Subject: Merging upstream version 2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Documentation/nvme-connect-all.html | 94 +++++++++++++++++++++++++++----------
 1 file changed, 68 insertions(+), 26 deletions(-)

(limited to 'Documentation/nvme-connect-all.html')

diff --git a/Documentation/nvme-connect-all.html b/Documentation/nvme-connect-all.html
index 89eae33..b1939f1 100644
--- a/Documentation/nvme-connect-all.html
+++ b/Documentation/nvme-connect-all.html
@@ -759,17 +759,21 @@ nvme-connect-all(1) Manual Page
                 [--hostnqn=&lt;hostnqn&gt;      | -q &lt;hostnqn&gt;]
                 [--hostid=&lt;hostid&gt;        | -I &lt;hostid&gt;]
                 [--raw=&lt;filename&gt;         | -r &lt;filename&gt;]
+                [--device=&lt;device&gt;        | -d &lt;device&gt;]
                 [--cfg-file=&lt;cfg&gt;         | -C &lt;cfg&gt;]
-                [--keep-alive-tmo=&lt;#&gt;     | -k &lt;#&gt;]
+                [--keep-alive-tmo=&lt;sec&gt;   | -k &lt;sec&gt;]
                 [--reconnect-delay=&lt;#&gt;    | -c &lt;#&gt;]
                 [--ctrl-loss-tmo=&lt;#&gt;      | -l &lt;#&gt;]
-                [--hdr-digest             | -g]
-                [--data-digest            | -G]
                 [--nr-io-queues=&lt;#&gt;       | -i &lt;#&gt;]
                 [--nr-write-queues=&lt;#&gt;    | -W &lt;#&gt;]
                 [--nr-poll-queues=&lt;#&gt;     | -P &lt;#&gt;]
                 [--queue-size=&lt;#&gt;         | -Q &lt;#&gt;]
+                [--keyring=&lt;#&gt;                    ]
+                [--tls_key=&lt;#&gt;                    ]
+                [--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>
-- 
cgit v1.2.3