James, Martin, here are 3 zfcp bug fixes for v5.1-rcX (or the next merge window). The patches apply to Martin's 5.1/scsi-fixes and to James' fixes branch. Steffen Maier (3): zfcp: fix rport unblock if deleted SCSI devices on Scsi_Host zfcp: fix scsi_eh host reset with port_forced ERP for non-NPIV FCP devices zfcp: reduce flood of fcrscn1 trace records on multi-element RSCN drivers/s390/scsi/zfcp_erp.c | 17 +++++++++++++++++ drivers/s390/scsi/zfcp_ext.h | 2 ++ drivers/s390/scsi/zfcp_fc.c | 21 +++++++++++++++++---- drivers/s390/scsi/zfcp_scsi.c | 4 ++++ 4 files changed, 40 insertions(+), 4 deletions(-) -- 2.16.4