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

author James Bottomley <[email protected]>

Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)

committer James Bottomley <[email protected]>

Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
author James Bottomley <[email protected]>
Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
committer James Bottomley <[email protected]>
Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge
diff --cc drivers/scsi/sg.c
Simple merge
author	James Bottomley <[email protected]>
	Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
committer	James Bottomley <[email protected]>
	Wed, 29 Mar 2017 14:10:30 +0000 (10:10 -0400)
		1	2
drivers/scsi/qla2xxx/qla_os.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sg.c	patch \|	diff1 \|	diff2 \|	blob \| history