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-get-log.txt | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'Documentation/nvme-get-log.txt')

diff --git a/Documentation/nvme-get-log.txt b/Documentation/nvme-get-log.txt
index a51c435..98b1f9c 100644
--- a/Documentation/nvme-get-log.txt
+++ b/Documentation/nvme-get-log.txt
@@ -9,17 +9,18 @@ SYNOPSIS
 --------
 [verse]
 'nvme get-log' <device> [--log-id=<log-id> | -i <log-id>]
-	      [--log-len=<log-len> | -l <log-len>]
-	      [--aen=<aen> | -a <aen>]
-	      [--namespace-id=<nsid> | -n <nsid>]
-	      [--raw-binary | -b]
-	      [--lpo=<offset> | -o <offset>]
-	      [--lsp=<field> | -s <field>]
-	      [--lsi=<field> | -S <field>]
-	      [--rae | -r]
-	      [--csi=<command_set_identifier> | -y <command_set_identifier>]
-	      [--ot=<offset_type> | -O <offset_type>]
-		    [--xfer-len=<length> | -x <length>]
+			[--log-len=<log-len> | -l <log-len>]
+			[--aen=<aen> | -a <aen>]
+			[--namespace-id=<nsid> | -n <nsid>]
+			[--raw-binary | -b]
+			[--lpo=<offset> | -L <offset>]
+			[--lsp=<field> | -s <field>]
+			[--lsi=<field> | -S <field>]
+			[--rae | -r]
+			[--csi=<command_set_identifier> | -y <command_set_identifier>]
+			[--ot=<offset_type> | -O <offset_type>]
+			[--xfer-len=<length> | -x <length>]
+			[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
 -----------
@@ -63,7 +64,7 @@ OPTIONS
 --raw-binary::
 	Print the raw log buffer to stdout.
 
--o <offset>::
+-L <offset>::
 --lpo=<offset>::
 	The log page offset specifies the location within a log page to start
 	returning data from. It's Dword-aligned and 64-bits.
@@ -101,6 +102,15 @@ OPTIONS
 	Specify the read chunk size. The length argument is expected to be
 	a multiple of 4096. The default size is 4096.
 
+-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
 --------
 * Get 512 bytes from log page 2
-- 
cgit v1.2.3