Linus Torvalds a46171d010 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending ... Pull SCSI target fixes from Nicholas Bellinger: "Here are the target-pending fixes queued for v3.18-rc6. The highlights include: - target-core OOPs fix with tcm_qla2xxx + vxworks FC initiators + zero length SCSI commands having a transfer direction set. (Roland + Craig Watson) - vhost-scsi OOPs fix to explicitly prevent WWPN endpoint configfs group removal while qemu still has an active reference. (Paolo + nab) - ib_srpt fix for RDMA hardware with lower srp_sq_size limits. (Bart) - two ib_isert work-arounds for running on ocrdma hardware (Or + Sagi + Chris) - iscsi-target discovery portal typo + SPC-3 PR Preempt SA key matching fix (Steve)" * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: IB/isert: Adjust CQ size to HW limits target: return CONFLICT only when SA key unmatched iser-target: Handle DEVICE_REMOVAL event on network portal listener correctly ib_isert: Add max_send_sge=2 minimum for control PDU responses srp-target: Retry when QP creation fails with ENOMEM iscsi-target: return the correct port in SendTargets vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT target: Don't call TFO->write_pending if data_length == 0		2014-11-21 16:28:45 -08:00
..
core	Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next	2014-10-14 14:09:12 -07:00
hw	mlx4: Avoid leaking steering rules on flow creation error flow	2014-10-30 19:48:58 -04:00
ulp	IB/isert: Adjust CQ size to HW limits	2014-11-19 22:28:42 -08:00
Kconfig	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00