This is a set of fixes that landed in the v4.14 & the v4.15 merge
window to address issues
with error recovery. All clean cherry picks, except the last patch,
where conflict resolutions are described in the S-o-B area.
The following changes since commit 8a82ebc79186f7fd22d4166d03e8f5f5b9bcf24f:
All clean cherry-picks, except for one patch: "scsi: hisi_sas:
complete all tasklets prior to host reset" that removed a chunk for a
piece of hardware (hisi_sas_v3) that is not supported in our artful