Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue
authorMartin K. Petersen <martin.petersen@oracle.com>
Thu, 10 Oct 2019 01:54:04 +0000 (21:54 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 10 Oct 2019 01:54:04 +0000 (21:54 -0400)
commita3a8d13f625d9f20664515d61d4c9a9452119d21
tree8d3bd45b741f10980c141cc35c06143a82e8ea18
parent27f722ccbe1563629275bb7ee30c0e307f5837a2
parentb23f330d5145b92f90cf16f1adc5444ad06764b4
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>
MAINTAINERS
drivers/scsi/hisi_sas/hisi_sas_main.c
drivers/scsi/qedf/qedf_main.c
drivers/scsi/qla2xxx/qla_attr.c
drivers/scsi/qla2xxx/qla_init.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/qla2xxx/qla_target.c
drivers/scsi/sd.c
drivers/scsi/ufs/ufshcd.c