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

author James Bottomley <James.Bottomley@HansenPartnership.com>

Fri, 5 Feb 2016 05:37:52 +0000 (21:37 -0800)

committer James Bottomley <James.Bottomley@HansenPartnership.com>

Fri, 5 Feb 2016 05:37:52 +0000 (21:37 -0800)
author James Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 5 Feb 2016 05:37:52 +0000 (21:37 -0800)
committer James Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 5 Feb 2016 05:37:52 +0000 (21:37 -0800)
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
author	James Bottomley <James.Bottomley@HansenPartnership.com>
	Fri, 5 Feb 2016 05:37:52 +0000 (21:37 -0800)
committer	James Bottomley <James.Bottomley@HansenPartnership.com>
	Fri, 5 Feb 2016 05:37:52 +0000 (21:37 -0800)
		1	2
block/blk-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_devinfo.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/storvsc_drv.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	patch \|	diff1 \|	diff2 \|	blob \| history