Merging upstream version 1.8.

Signed-off-by: Daniel Baumann <daniel@debian.org>

doc/rst/fabrics.rst

@@ -34,6 +34,7 @@ Fabrics-specific definitions.
     bool hdr_digest;
     bool data_digest;
     bool tls;
+    bool concat;
   };
 
 **Members**
@@ -92,6 +93,9 @@ Fabrics-specific definitions.
 ``tls``
   Start TLS on the connection (TCP)
 
+``concat``
+  Enable secure concatenation (TCP)
+
 
 
 .. c:function:: const char * nvmf_trtype_str (__u8 trtype)

doc/rst/types.rst

@@ -241,6 +241,15 @@ The 'name' field from 'value'
 ``NVME_REG_CMBSTS``
   Controller Memory Buffer Status
 
+``NVME_REG_CMBEBS``
+  Controller Memory Buffer Elasticity Buffer Size
+
+``NVME_REG_CMBSWTP``
+  Controller Memory Buffer Sustained Write Throughput
+
+``NVME_REG_NSSD``
+  NVM Subsystem Shutdown
+
 ``NVME_REG_CRTO``
   Controller Ready Timeouts
 

doc/rst/util.rst

@@ -649,6 +649,23 @@ https://www.rfc-editor.org/rfc/rfc4122#section-4.4
 Returns error code if generating of random number fails.
 
 
+.. c:function:: int nvme_uuid_find (struct nvme_id_uuid_list *uuid_list, const unsigned char uuid[NVME_UUID_LEN])
+
+   Find UUID position on UUID list
+
+**Parameters**
+
+``struct nvme_id_uuid_list *uuid_list``
+  UUID list returned by identify UUID
+
+``const unsigned char uuid[NVME_UUID_LEN]``
+  Binary encoded input UUID
+
+**Return**
+
+The array position where given UUID is present, or -1 on failure with errno set.
+
+
 .. c:function:: bool nvme_ipaddrs_eq (const char *addr1, const char *addr2)
 
    Check if 2 IP addresses are equal.