Merging upstream version 1.15.

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

Documentation/nvme-connect.txt

@@ -14,6 +14,7 @@ SYNOPSIS
 		[--traddr=<traddr>        | -a <traddr>]
 		[--trsvcid=<trsvcid>      | -s <trsvcid>]
 		[--host-traddr=<traddr>   | -w <traddr>]
+		[--host-iface=<iface>     | -f <iface>]
 		[--hostnqn=<hostnqn>      | -q <hostnqn>]
 		[--hostid=<hostid>        | -I <hostid>]
 		[--nr-io-queues=<#>       | -i <#>]
@@ -27,6 +28,7 @@ SYNOPSIS
 		[--disable-sqflow         | -d]
 		[--hdr-digest             | -g]
 		[--data-digest            | -G]
+		[--output-format=<fmt>    | -o <fmt>]
 
 DESCRIPTION
 -----------
@@ -69,7 +71,14 @@ OPTIONS
 -w <traddr>::
 --host-traddr=<traddr>::
 	This field specifies the network address used on the host to connect
-	to the Controller.
+	to the Controller. For TCP, this sets the source address on the socket.
+
+-f <iface>::
+--host-iface=<iface>::
+	This field specifies the network interface used on the host to connect
+	to the Controller (e.g. IP eth1, enp2s0, enx78e7d1ea46da). This forces
+	the connection to be made on a specific interface instead of letting
+	the system decide.
 
 -q <hostnqn>::
 --hostnqn=<hostnqn>::
@@ -132,6 +141,12 @@ OPTIONS
 --data-digest::
 	Generates/verifies data digest (TCP).
 
+-o <format>::
+--output-format=<format>::
+	Set the reporting format to 'normal' or 'json'. Only one output format can
+	be used at a time. When this option is specified, the device associated with
+	the connection will be printed. Nothing is printed otherwise.
+
 EXAMPLES
 --------
 * Connect to a subsystem named nqn.2014-08.com.example:nvme:nvm-subsystem-sn-d78432