Commit 8f399921 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5',... 

Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next
parents 5462eddd 298589b1 c1c98501 437708c4 79adc532 af2e2e35 57761d8d be8348df 6e0ea9e6 0c7f8218 a384b20e

Documentation/scsi/scsi_transport_srp/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
all: rport_state_diagram.svg rport_state_diagram.png



rport_state_diagram.svg: rport_state_diagram.dot

	dot -Tsvg -o $@ $<



rport_state_diagram.png: rport_state_diagram.dot

	dot -Tpng -o $@ $<

Documentation/scsi/scsi_transport_srp/rport_state_diagram.dot

0 → 100644
+26 −0
Original line number Diff line number Diff line 
digraph srp_initiator {

	node [shape = doublecircle]; running lost;

	node [shape = circle];



	{

	  rank = min;

	  running_rta	[ label = "running;\nreconnect\ntimer\nactive" ];

	};

	running		[ label = "running;\nreconnect\ntimer\nstopped" ];

	blocked;

	failfast	[ label = "fail I/O\nfast" ];

	lost;



	running -> running_rta		[ label = "fast_io_fail_tmo = off and\ndev_loss_tmo = off;\nsrp_start_tl_fail_timers()" ];

	running_rta -> running		[ label = "fast_io_fail_tmo = off and\ndev_loss_tmo = off;\nreconnecting succeeded" ];

	running -> blocked		[ label = "fast_io_fail_tmo >= 0 or\ndev_loss_tmo >= 0;\nsrp_start_tl_fail_timers()" ];

	running -> failfast		[ label = "fast_io_fail_tmo = off and\ndev_loss_tmo = off;\nreconnecting failed\n" ];

	blocked -> failfast		[ label = "fast_io_fail_tmo\nexpired or\nreconnecting\nfailed" ];

	blocked -> lost			[ label = "dev_loss_tmo\nexpired or\nsrp_stop_rport_timers()" ];

	failfast -> lost		[ label = "dev_loss_tmo\nexpired or\nsrp_stop_rport_timers()" ];

	blocked -> running		[ label = "reconnecting\nsucceeded" ];

	failfast -> failfast		[ label = "reconnecting\nfailed" ];

	failfast -> running		[ label = "reconnecting\nsucceeded" ];

	running -> lost			[ label = "srp_stop_rport_timers()" ];

	running_rta -> lost		[ label = "srp_stop_rport_timers()" ];

}

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -2158,6 +2158,11 @@ M: Nishank Trivedi <nistrive@cisco.com> 
S:	Supported

F:	drivers/net/ethernet/cisco/enic/



CISCO VIC LOW LATENCY NIC DRIVER

M:      Upinder Malhi <umalhi@cisco.com>

S:      Supported

F:      drivers/infiniband/hw/usnic



CIRRUS LOGIC EP93XX ETHERNET DRIVER

M:	Hartley Sweeten <hsweeten@visionengravers.com>

L:	netdev@vger.kernel.org
@@ -7468,7 +7473,7 @@ S: Maintained 
F:	drivers/scsi/sr*



SCSI RDMA PROTOCOL (SRP) INITIATOR

M:	David Dillow <dillowda@ornl.gov>

M:	Bart Van Assche <bvanassche@acm.org>

L:	linux-rdma@vger.kernel.org

S:	Supported

W:	http://www.openfabrics.org

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ source "drivers/infiniband/hw/mlx4/Kconfig" 
source "drivers/infiniband/hw/mlx5/Kconfig"

source "drivers/infiniband/hw/nes/Kconfig"

source "drivers/infiniband/hw/ocrdma/Kconfig"

source "drivers/infiniband/hw/usnic/Kconfig"



source "drivers/infiniband/ulp/ipoib/Kconfig"

drivers/infiniband/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ 
obj-$(CONFIG_MLX5_INFINIBAND)		+= hw/mlx5/

obj-$(CONFIG_INFINIBAND_NES)		+= hw/nes/

obj-$(CONFIG_INFINIBAND_OCRDMA)		+= hw/ocrdma/

obj-$(CONFIG_INFINIBAND_USNIC)		+= hw/usnic/

obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/

obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/

obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/