Merging upstream version 2.4.

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

Documentation/nvme-supported-log-pages.txt

@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'nvme supported-log-pages' <device> [--output-format=<fmt> | -o <fmt>]
-                            [--human-readable | -H]
+                            [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -30,10 +30,9 @@ OPTIONS
 	This option will set the reporting format to normal, json, or binary.
 	Only one output format can be used at a time.
 
--H::
---human-readable::
-	This option will parse and format many of the bit fields into a
-	human-readable format.
+-v::
+--verbose::
+	Show more information including LID Supported (LSUPP) and Index Offset Supported (IOP) details.
 
 EXAMPLES
 --------
@@ -41,4 +40,4 @@ No examples provided yet.
 
 NVME
 ----
-Part of the nvme-user suite
+Part of the nvme-user suite