From fb32fdeba1f428a3f6c30c8951e82f2a2eec23a8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 12 Aug 2021 14:01:09 +0200
Subject: Merging upstream version 1.15.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Documentation/nvme-list-ctrl.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Documentation/nvme-list-ctrl.txt')

diff --git a/Documentation/nvme-list-ctrl.txt b/Documentation/nvme-list-ctrl.txt
index b60afb7..45707e7 100644
--- a/Documentation/nvme-list-ctrl.txt
+++ b/Documentation/nvme-list-ctrl.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'nvme list-ctrl' <device> [--cntid=<cntid> | -c <cntid>]
-			[--namespace-id=<nsid> | -n <nsid>]
+			[--namespace-id=<nsid> | -n <nsid>] [-o <fmt> | --output-format=<fmt>]
 DESCRIPTION
 -----------
 For the NVMe device given, sends an identify command for controller list
@@ -37,6 +37,11 @@ OPTIONS
 	command requests the controller list for the entire subsystem,
 	whether or not they are attached to namespace(s).
 
+-o <format>::
+--output-format=<format>::
+	Set the reporting format to 'normal' or 'json'. Only one output
+	format can be used at a time.
+
 EXAMPLES
 --------
 No examples yet.
-- 
cgit v1.2.3