Merging upstream version 2.11.

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

Documentation/nvme-gen-tls-key.txt

@@ -16,6 +16,7 @@ SYNOPSIS
 			[--identity=<id-vers> | -I <id-vers>]
 			[--secret=<secret> | -s <secret>]
 			[--insert | -i]
+			[--keyfile=<keyfile> | -f <keyfile>]
 			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
@@ -81,6 +82,11 @@ OPTIONS
 	Insert the resulting TLS key into the keyring without printing out
 	the key in PSK interchange format.
 
+-f <keyfile>
+--keyfile=<keyfile>
+	Append the resulting TLS key to keyfile. This command line option is
+	depending on --insert.
+
 -o <fmt>::
 --output-format=<fmt>::
 	Set the reporting format to 'normal', 'json' or 'binary'. Only one