Merging upstream version 2.4+really2.3.

This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667.

1 files changed, 30 insertions, 60 deletions

diff --git a/Documentation/nvme-discover.html b/Documentation/nvme-discover.html
index 5f3c94e..17d8e51 100644
--- a/Documentation/nvme-discover.html
+++ b/Documentation/nvme-discover.html
@@ -764,17 +764,14 @@ nvme-discover(1) Manual Page
                 [--keep-alive-tmo=<sec>   | -k <sec>]

                 [--reconnect-delay=<#>    | -c <#>]

                 [--ctrl-loss-tmo=<#>      | -l <#>]

+                [--hdr_digest             | -g]

+                [--data_digest            | -G]

                 [--nr-io-queues=<#>       | -i <#>]

                 [--nr-write-queues=<#>    | -W <#>]

                 [--nr-poll-queues=<#>     | -P <#>]

                 [--queue-size=<#>         | -Q <#>]

-                [--keyring=<#>                    ]

-                [--tls_key=<#>                    ]

-                [--hdr-digest             | -g]

-                [--data-digest            | -G]

                 [--persistent             | -p]

                 [--quiet                  | -S]

-                [--tls                        ]

                 [--dump-config            | -O]

                 [--output-format=<fmt>    | -o <fmt>]

                 [--force]</pre>

@@ -888,7 +885,7 @@ cellspacing="0" cellpadding="4">
 <p>

         This field specifies the network address of the Discovery Controller.

         For transports using IP addressing (e.g. rdma) this should be an

-        IP-based address (ex. IPv4).

+        IP-based (ex. IPv4) address.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -977,10 +974,8 @@ cellspacing="0" cellpadding="4">
 </dt>

 <dd>

 <p>

-        This field takes a device as input. It must be a persistent device

-        associated with a Discovery Controller previously created by the

-        command "connect-all" or "discover". &lt;device&gt; follows the format

-        nvme*, eg. nvme0, nvme1.

+        This field takes a device as input. Device is in the format of nvme*,

+        eg. nvme0, nvme1

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1006,8 +1001,8 @@ cellspacing="0" cellpadding="4">
 </dt>

 <dd>

 <p>

-        Overrides the default keep alive timeout (in seconds). This

-        option will be ignored for discovery, and it is only

+        Overrides the default timeout (in seconds) for keep alive.

+        This option will be ignored for the discovery, and it is only

         implemented for completeness.

 </p>

 </dd>

@@ -1035,90 +1030,74 @@ cellspacing="0" cellpadding="4">
 </p>

 </dd>

 <dt class="hdlist1">

--i &lt;#&gt;

-</dt>

-<dt class="hdlist1">

---nr-io-queues=&lt;#&gt;

-</dt>

-<dd>

-<p>

-        Overrides the default number of I/O queues create by the driver.

-        This option will be ignored for the discovery, and it is only

-        implemented for completeness.

-</p>

-</dd>

-<dt class="hdlist1">

--W &lt;#&gt;

+-g

 </dt>

 <dt class="hdlist1">

---nr-write-queues=&lt;#&gt;

+--hdr_digest

 </dt>

 <dd>

 <p>

-        Adds additional queues that will be used for write I/O.

+        Generates/verifies header digest (TCP).

 </p>

 </dd>

 <dt class="hdlist1">

--P &lt;#&gt;

+-G

 </dt>

 <dt class="hdlist1">

---nr-poll-queues=&lt;#&gt;

+--data_digest

 </dt>

 <dd>

 <p>

-        Adds additional queues that will be used for polling latency sensitive I/O.

+        Generates/verifies data digest (TCP).

 </p>

 </dd>

 <dt class="hdlist1">

--Q &lt;#&gt;

+-i &lt;#&gt;

 </dt>

 <dt class="hdlist1">

---queue-size=&lt;#&gt;

+--nr-io-queues=&lt;#&gt;

 </dt>

 <dd>

 <p>

-        Overrides the default number of elements in the I/O queues created

-        by the driver which can be found at drivers/nvme/host/fabrics.h.

+        Overrides the default number of I/O queues create by the driver.

         This option will be ignored for the discovery, and it is only

         implemented for completeness.

 </p>

 </dd>

 <dt class="hdlist1">

---keyring=&lt;#&gt;

+-W &lt;#&gt;

 </dt>

-<dd>

-<p>

-        Keyring for TLS key lookup.

-</p>

-</dd>

 <dt class="hdlist1">

---tls_key=&lt;#&gt;

+--nr-write-queues=&lt;#&gt;

 </dt>

 <dd>

 <p>

-        TLS key for the connection (TCP).

+        Adds additional queues that will be used for write I/O.

 </p>

 </dd>

 <dt class="hdlist1">

--g

+-P &lt;#&gt;

 </dt>

 <dt class="hdlist1">

---hdr-digest

+--nr-poll-queues=&lt;#&gt;

 </dt>

 <dd>

 <p>

-        Generates/verifies header digest (TCP).

+        Adds additional queues that will be used for polling latency sensitive I/O.

 </p>

 </dd>

 <dt class="hdlist1">

--G

+-Q &lt;#&gt;

 </dt>

 <dt class="hdlist1">

---data-digest

+--queue-size=&lt;#&gt;

 </dt>

 <dd>

 <p>

-        Generates/verifies data digest (TCP).

+        Overrides the default number of elements in the I/O queues created

+        by the driver which can be found at drivers/nvme/host/fabrics.h.

+        This option will be ignored for the discovery, and it is only

+        implemented for completeness.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1129,16 +1108,7 @@ cellspacing="0" cellpadding="4">
 </dt>

 <dd>

 <p>

-        Don&#8217;t remove the discovery controller after retrieving the discovery

-        log page.

-</p>

-</dd>

-<dt class="hdlist1">

---tls

-</dt>

-<dd>

-<p>

-        Enable TLS encryption (TCP).

+        Persistent discovery connection.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1248,7 +1218,7 @@ nvme-connect-all(1)</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-03-31 16:17:28 CEST

+ 2023-01-30 14:14:16 CET

 </div>

 </div>

 </body>