James, Martin, this is the zfcp patch set for the v4.18 merge window. The patches apply to Martin's 4.18/scsi-queue. The patches eventually go on top of the bug fix commit fa89adba1941e4f3b213399b81732a5c12fd9131 ("scsi: zfcp: fix infinite iteration on ERP ready list") in Martin's 4.17/scsi-fixes or James' scsi-fixes [https://www.spinics.net/lists/linux-scsi/msg120124.html]. There should be no merge conflicts between the fix and this patch set. Patches 1-7 are debugging/tracing fixes found during function test of 8-14. Patches 8-14 are the result of an earlier RFC to prepare for changing scsi_eh callback function arguments to decouple from scsi_cmnd. [http://www.spinics.net/lists/linux-scsi/msg111192.html / https://marc.info/?l=linux-scsi&m=150099208822680&w=2] The only difference is that I have to defer the conversion of host_reset(). Patches 15-25 are small cleanups / updates. Jens Remus (3): zfcp: assert that the ERP lock is held when tracing a recovery trigger zfcp: add port speed capabilities zfcp: enhance comments on fc_link_speed and supported_speed Steffen Maier (22): zfcp: fix missing SCSI trace for result of eh_host_reset_handler zfcp: fix missing SCSI trace for retry of abort / scsi_eh TMF zfcp: fix misleading REC trigger trace where erp_action setup failed zfcp: fix missing REC trigger trace on terminate_rport_io early return zfcp: fix missing REC trigger trace on terminate_rport_io for ERP_FAILED zfcp: fix missing REC trigger trace for all objects in ERP_FAILED zfcp: fix missing REC trigger trace on enqueue without ERP thread zfcp: decouple SCSI traces for scsi_eh / TMF from scsi_cmnd zfcp: decouple TMF response handler from scsi_cmnd zfcp: split FCP_CMND IU setup between SCSI I/O and TMF again zfcp: decouple FSF request setup of TMF from scsi_cmnd zfcp: decouple SCSI setup of TMF from scsi_cmnd zfcp: decouple TMFs from scsi_cmnd by using fc_block_rport zfcp: decouple our scsi_eh callbacks from scsi_cmnd workqueue,zfcp: set description for port work items with their WWPN as context zfcp: consistently use function name space prefix zfcp: remove unused ERP enum values zfcp: zfcp_erp_action_exists() does only check for running zfcp: remove unused return values of ERP trigger functions zfcp: explicitly support initiator in scsi_host_template zfcp: support SCSI_ADAPTER_RESET via scsi_host sysfs attribute host_reset zfcp: cleanup indentation for posting FC events drivers/s390/scsi/zfcp_dbf.c | 90 +++++++++++++++---- drivers/s390/scsi/zfcp_dbf.h | 21 +++-- drivers/s390/scsi/zfcp_erp.c | 194 ++++++++++++++++++++++++++++------------- drivers/s390/scsi/zfcp_ext.h | 16 +++- drivers/s390/scsi/zfcp_fc.c | 11 +-- drivers/s390/scsi/zfcp_fc.h | 22 +++-- drivers/s390/scsi/zfcp_fsf.c | 61 ++++++++----- drivers/s390/scsi/zfcp_fsf.h | 6 +- drivers/s390/scsi/zfcp_scsi.c | 141 +++++++++++++++++++++++------- drivers/s390/scsi/zfcp_sysfs.c | 5 +- kernel/workqueue.c | 1 + 11 files changed, 401 insertions(+), 167 deletions(-) -- 2.16.3 -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html