From 66e4b69042cd3b44acd42f1fad2109180c1bc48b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 24 Dec 2023 08:57:54 +0100
Subject: Merging upstream version 2.7.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Documentation/nvme-rpmb.txt | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'Documentation/nvme-rpmb.txt')

diff --git a/Documentation/nvme-rpmb.txt b/Documentation/nvme-rpmb.txt
index c30c83d..9dc954d 100644
--- a/Documentation/nvme-rpmb.txt
+++ b/Documentation/nvme-rpmb.txt
@@ -9,13 +9,13 @@ SYNOPSIS
 --------
 [verse]
 'nvme rpmb' <device> [--cmd=<command> | -c <command>]
-		    [--msgfile=<data-file> | -f <data-file>]
-		    [--keyfile=<key-file> | -g <key-file>]
-		    [--key=<key> | -k <key>]
-		    [--msg=<data> | -d <data>]
-		    [--address=<offset> | -o <offset>]
-		    [--blocks=<512 byte sectors> | -b <sectors> ]
-		    [--target=<target-id> | -t <id> ]
+			[--msgfile=<data-file> | -f <data-file>]
+			[--keyfile=<key-file> | -g <key-file>]
+			[--key=<key> | -k <key>] [--msg=<data> | -d <data>]
+			[--address=<offset> | -o <offset>]
+			[--blocks=<512 byte sectors> | -b <sectors>]
+			[--target=<target-id> | -t <id>]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -71,7 +71,7 @@ OPTIONS
 	nvme-rpmb without sending it to device. RPMB target 0 is used as the
 	default target if --target or -t is not specified. 0x0 is used as the
 	default address if no -address or -o option is specified, 
-	
+
 -t <target>::
 --target=<target>::
 	RPMB target id. This should be one of the supported RPMB targets as
@@ -105,6 +105,15 @@ OPTIONS
 	The size in 512 byte sectors to be used for data transfer commands
 	(read or write) for a specified RPMB target.
 
+-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
 --------
 * Print RPMB support information of an NVMe device
@@ -147,4 +156,3 @@ EXAMPLES
 NVME
 ----
 Part of the nvme-user suite
-
-- 
cgit v1.2.3