Merging upstream version 2.7.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 11 deletions

diff --git a/Documentation/nvme-zns-zone-mgmt-send.html b/Documentation/nvme-zns-zone-mgmt-send.html
index 424c2ff..9b92844 100644
--- a/Documentation/nvme-zns-zone-mgmt-send.html
+++ b/Documentation/nvme-zns-zone-mgmt-send.html
@@ -750,13 +750,11 @@ nvme-zns-zone-mgmt-send(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>nvme zns zone-mgmt-send</em> &lt;device&gt; [--namespace-id=&lt;NUM&gt; | -n &lt;NUM&gt;]

-                                   [--start-lba=&lt;IONUM&gt;, -s &lt;IONUM&gt;]

-                                   [--zsaso, -o]

-                                   [--select-all, -a]

-                                   [--zsa=&lt;NUM&gt;, -z &lt;NUM&gt;]

-                                   [--data-len=&lt;IONUM&gt;, -l &lt;IONUM&gt;]

-                                   [--data=&lt;FILE&gt;, -d &lt;FILE&gt;]

-                                   [--timeout=&lt;timeout&gt; | -t &lt;timeout&gt;]</pre>

+                        [--start-lba=&lt;IONUM&gt;, -s &lt;IONUM&gt;] [--zsaso, -o]

+                        [--select-all, -a] [--zsa=&lt;NUM&gt;, -z &lt;NUM&gt;]

+                        [--data-len=&lt;IONUM&gt;, -l &lt;IONUM&gt;]

+                        [--data=&lt;FILE&gt;, -d &lt;FILE&gt;]

+                        [--timeout=&lt;timeout&gt; | -t &lt;timeout&gt;]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -821,10 +819,10 @@ Alternatively, the data may come from a file that can be specified.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

---select-all

+-a

 </dt>

 <dt class="hdlist1">

--a

+--select-all

 </dt>

 <dd>

 <p>

@@ -854,7 +852,7 @@ Alternatively, the data may come from a file that can be specified.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

--d &lt;FILE

+-d &lt;FILE&gt;

 </dt>

 <dt class="hdlist1">

 --data=&lt;FILE&gt;

@@ -916,7 +914,7 @@ Write "hello world" into the zone descriptor for namespace 1&#8217;s first zone
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-06-30 15:20:22 CEST

+ 2023-12-21 15:49:29 CET

 </div>

 </div>

 </body>