Adding upstream version 2.7.1.

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

Documentation/nvme-capacity-mgmt.txt

@@ -4,15 +4,16 @@ nvme-capacity-mgmt(1)
 NAME
 ----
 nvme-capacity-mgmt - Send capacity management command to configure/create/delete
-                     Endurance Groups or NVM Sets, returns results.
+Endurance Groups or NVM Sets, returns results.
 
 SYNOPSIS
 --------
 [verse]
-'nvme capacity-mgmt' <device> [--operation=<operation> | -o <operation>]
+'nvme capacity-mgmt' <device> [--operation=<operation> | -O <operation>]
 			[--element-id=<element-id> | -i <element-id>]
 			[--cap-lower=<cap-lower> | -l <cap-lower>]
 			[--cap-upper=<cap-upper> | -u <cap-upper>]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -27,23 +28,32 @@ device (ex: /dev/nvme0), or a namespace block device (ex: /dev/nvme0n1).
 
 OPTIONS
 -------
--o <operation>::
+-O <operation>::
 --operation=<operation>::
-    Operation to be performed by the controller
+	Operation to be performed by the controller
 
 -i <element-id>::
 --element-id=<element-id>::
-    Value specific to the value of the Operation field.
+	Value specific to the value of the Operation field.
 
 -l <cap-lower>::
 --cap-lower=<cap-lower>::
 	Least significant 32 bits of the capacity in bytes of the Endurance Group or
-    NVM Set to be created
+	NVM Set to be created
 
 -u <cap-upper>::
 --cap-upper=<cap-upper>::
 	Most significant 32 bits of the capacity in bytes of the Endurance Group or
-    NVM Set to be created
+	NVM Set to be created
+
+-o <fmt>::
+--output-format=<fmt>::
+	Set the reporting format to 'normal', 'json' or 'binary'. Only one
+	output format can be used at a time.
+
+-v::
+--verbose::
+	Increase the information detail in the output.
 
 EXAMPLES
 --------