[dm-devel] [PATCH 35/42] multipath.conf.5: Clarify dev_loss_tmo settings

[Hannes Reinecke]

We need to document that dev_loss_tmo is in fact modified
by no_path_retry.

Signed-off-by: Hannes Reinecke <hare at suse.de>
---
 multipath/multipath.conf.5 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
index 9d6266c..247cdc0 100644
--- a/multipath/multipath.conf.5
+++ b/multipath/multipath.conf.5
@@ -334,9 +334,14 @@ will disable the timeout.
 .TP
 .B dev_loss_tmo
 Specify the number of seconds the scsi layer will wait after a problem has
+<<<<<<< HEAD
 been detected on a FC remote port before removing it from the system. This
 can be set to "infinity" which sets it to the max value of 2147483647
-seconds, or 68 years.
+seconds, or 68 years. It will be automatically adjusted to the overall
+retry interval
+\fIno_path_retry\fR * \fIpolling_interval\fR
+if a number of retries is given with \fIno_path_retry\fR and the
+overall retry interval is longer than the specified \fIdev_loss_tmo\fR value.
 .TP
 .B queue_without_daemon
 If set to
-- 
1.7.4.2