Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue

The qla2xxx driver updates for 5.5 depend on the fixes queued for
5.4.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_main.c
Simple merge

diff --cc drivers/scsi/qedf/qedf_main.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_attr.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_init.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge