Merge branch 'fixes' into misc

diff --cc Documentation/ABI/testing/sysfs-driver-ufs
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_hbadisc.c
Simple merge

diff --cc drivers/scsi/pm8001/pm8001_init.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_def.h
Simple merge

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

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

diff --cc drivers/ufs/core/ufs-mcq.c
Simple merge

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

diff --cc drivers/ufs/host/ufs-qcom.c
Simple merge

diff --cc drivers/ufs/host/ufs-renesas.c
Simple merge

diff --cc include/uapi/scsi/scsi_bsg_ufs.h
Simple merge

diff --cc include/ufs/ufs.h
Simple merge