Merging upstream version 1.16.

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

Documentation/nvme-zns-set-zone-desc.txt

@@ -11,6 +11,7 @@ SYNOPSIS
 'nvme zns setzone-desc' <device> [--namespace-id=<NUM> | -n <NUM>]
 				 [--start-lba=<IONUM>, -s <IONUM>]
 				 [-data=<FILE>, -d <FILE>]
+				 [--timeout=<timeout> | -t <timeout>]
 
 DESCRIPTION
 -----------
@@ -35,6 +36,9 @@ OPTIONS
 -data=<FILE>::
 	Optional file for data (default stdin)
 
+-t <timeout>::
+--timeout=<timeout>::
+	Override default timeout value. In milliseconds.
 
 EXAMPLES
 --------