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.html | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'Documentation/nvme-discover.html') diff --git a/Documentation/nvme-discover.html b/Documentation/nvme-discover.html index dc56c6b..0d5f6a9 100644 --- a/Documentation/nvme-discover.html +++ b/Documentation/nvme-discover.html @@ -759,7 +759,7 @@ nvme-discover(1) Manual Page [--hostid=<hostid> | -I <hostid>] [--raw=<filename> | -r <filename>] [--device=<device> | -d <device>] - [--cfg-file=<cfg> | -C <cfg>] + [--config=<filename> | -J <filename>] [--keep-alive-tmo=<sec> | -k <sec>] [--reconnect-delay=<#> | -c <#>] [--ctrl-loss-tmo=<#> | -l <#>] @@ -768,7 +768,7 @@ nvme-discover(1) Manual Page [--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=<fmt> | -o <fmt>] [--force] [--nbft] [--no-nbft] [--nbft-path=<STR>] [--context=<STR>] @@ -979,10 +979,10 @@ cellspacing="0" cellpadding="4">

--C <cfg> +-J <filename>
---config-file=<cfg> +--config=<filename>

@@ -990,7 +990,7 @@ cellspacing="0" cellpadding="4"> default /usr/local/etc/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

@@ -1137,6 +1137,14 @@ cellspacing="0" cellpadding="4">

+--concat +
+
+

+ Enable secure concatenation (TCP). +

+
+
-S
@@ -1317,7 +1325,7 @@ nvme-connect-all(1)

-- cgit v1.2.3