Merging upstream version 2.4+really2.4.

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

1 files changed, 31 insertions, 11 deletions

diff --git a/Documentation/nvme-connect-all.txt b/Documentation/nvme-connect-all.txt
index b449955..44bb4f9 100644
--- a/Documentation/nvme-connect-all.txt
+++ b/Documentation/nvme-connect-all.txt
@@ -18,17 +18,21 @@ SYNOPSIS
 		[--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]
 
@@ -114,6 +118,13 @@ OPTIONS
 	and dump it to a raw binary file. By default 'nvme connect-all' will
 	dump the output to stdout.
 
+-d <device>::
+--device=<device>::
+	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". <device> follows the format
+	nvme*, eg. nvme0, nvme1.
+
 -C <cfg>::
 --config-file=<cfg>::
 	Use the specified JSON configuration file instead of the
@@ -137,14 +148,6 @@ OPTIONS
 --ctrl-loss-tmo=<#>::
 	Overrides the default controller loss timeout period (in seconds).
 
--g::
---hdr-digest::
-	Generates/verifies header digest (TCP).
-
--G::
---data-digest::
-	Generates/verifies data digest (TCP).
-
 -i <#>::
 --nr-io-queues=<#>::
 	Overrides the default number of I/O queues create by the driver.
@@ -165,11 +168,28 @@ OPTIONS
 	by the driver. This option will be ignored for discovery, but will be
 	passed on to the subsequent connect call.
 
+--keyring=<#>::
+	Keyring for TLS key lookup.
+
+--tls_key=<#>::
+	TLS key for the connection (TCP).
+
+-g::
+--hdr-digest::
+	Generates/verifies header digest (TCP).
+
+-G::
+--data-digest::
+	Generates/verifies data digest (TCP).
+
 -p::
 --persistent::
 	Don't remove the discovery controller after retrieving the discovery
 	log page.
 
+--tls::
+	Enable TLS encryption (TCP).
+
 -S::
 --quiet::
 	Suppress error messages.