Hi Martin, This patch series fixes a deadlock in the UFS driver between the suspend/resume code and the SCSI error handler. Please consider this patch series for the next merge window. Thanks, Bart. Bart Van Assche (8): scsi: core: Fix a race between scsi_done() and scsi_times_out() scsi: core: Change the return type of .eh_timed_out() scsi: ufs: Remove an outdated comment scsi: ufs: Use 'else' in ufshcd_set_dev_pwr_mode() scsi: ufs: Try harder to change the power mode scsi: ufs: Split ufshcd_err_handler() scsi: ufs: Add a PM notifier scsi: ufs: Fix deadlock between power management and error handler Documentation/scsi/scsi_eh.rst | 7 +- drivers/message/fusion/mptsas.c | 8 +- drivers/scsi/libiscsi.c | 26 +++--- drivers/scsi/megaraid/megaraid_sas_base.c | 7 +- drivers/scsi/mvumi.c | 4 +- drivers/scsi/qla4xxx/ql4_os.c | 8 +- drivers/scsi/scsi_error.c | 38 ++++----- drivers/scsi/scsi_transport_fc.c | 8 +- drivers/scsi/scsi_transport_srp.c | 8 +- drivers/scsi/storvsc_drv.c | 4 +- drivers/scsi/virtio_scsi.c | 4 +- drivers/ufs/core/ufshcd.c | 98 ++++++++++++++++++----- include/scsi/libiscsi.h | 2 +- include/scsi/scsi_host.h | 14 +++- include/scsi/scsi_transport_fc.h | 2 +- include/scsi/scsi_transport_srp.h | 2 +- include/ufs/ufshcd.h | 7 +- 17 files changed, 161 insertions(+), 86 deletions(-)