Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

diff --cc block/blk-core.c
Simple merge

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

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

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

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

diff --cc include/linux/blkdev.h
Simple merge