From 476d0b41d27c48140ec2284a5a5f505e8423fe65 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 19 Feb 2024 11:45:37 +0100 Subject: Merging upstream version 2.8. Signed-off-by: Daniel Baumann --- Documentation/nvme-discover.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Documentation/nvme-discover.txt') diff --git a/Documentation/nvme-discover.txt b/Documentation/nvme-discover.txt index 32f10bc..1069d3c 100644 --- a/Documentation/nvme-discover.txt +++ b/Documentation/nvme-discover.txt @@ -18,7 +18,7 @@ SYNOPSIS [--hostid= | -I ] [--raw= | -r ] [--device= | -d ] - [--cfg-file= | -C ] + [--config= | -J ] [--keep-alive-tmo= | -k ] [--reconnect-delay=<#> | -c <#>] [--ctrl-loss-tmo=<#> | -l <#>] @@ -27,7 +27,7 @@ SYNOPSIS [--nr-poll-queues=<#> | -P <#>] [--queue-size=<#> | -Q <#>] [--keyring=<#>] [--tls_key=<#>] [--hdr-digest | -g] [--data-digest | -G] - [--persistent | -p] [--quiet | -S] [--tls] + [--persistent | -p] [--quiet | -S] [--tls] [--concat] [--dump-config | -O] [--output-format= | -o ] [--force] [--nbft] [--no-nbft] [--nbft-path=] [--context=] @@ -140,13 +140,13 @@ OPTIONS command "connect-all" or "discover". follows the format nvme*, eg. nvme0, nvme1. --C :: ---config-file=:: +-J :: +--config=:: Use the specified JSON configuration file instead of the default @SYSCONFDIR@/nvme/config.json file or 'none' to not read in an existing configuration file. The JSON configuration file format is documented in - https://github.com/linux-nvme/libnvme/doc/config-schema.json + https://github.com/linux-nvme/libnvme/blob/master/doc/config-schema.json -k <#>:: --keep-alive-tmo=<#>:: @@ -206,6 +206,9 @@ OPTIONS --tls:: Enable TLS encryption (TCP). +--concat:: + Enable secure concatenation (TCP). + -S:: --quiet:: Suppress already connected errors. -- cgit v1.2.3