Merging upstream version 2.10.

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

Documentation/nvme-connect.txt

@@ -27,7 +27,7 @@ SYNOPSIS
 			[--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=<fmt> | -o <fmt>] [--verbose | -v]
@@ -144,6 +144,8 @@ OPTIONS
 -l <#>::
 --ctrl-loss-tmo=<#>::
 	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 'reconnect-delay' seconds.
 
 -T <#>::
 --tos=<#>::
@@ -160,7 +162,6 @@ OPTIONS
 	Allows duplicated connections between same transport host and subsystem
 	port.
 
--d::
 --disable-sqflow::
 	Disables SQ flow control to omit head doorbell update for submission
 	queues when sending nvme completions.