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

author James Bottomley <[email protected]>

Tue, 7 Mar 2017 23:13:02 +0000 (15:13 -0800)

committer James Bottomley <[email protected]>

Tue, 7 Mar 2017 23:13:02 +0000 (15:13 -0800)
author James Bottomley <[email protected]>
Tue, 7 Mar 2017 23:13:02 +0000 (15:13 -0800)
committer James Bottomley <[email protected]>
Tue, 7 Mar 2017 23:13:02 +0000 (15:13 -0800)
diff --cc drivers/scsi/libiscsi.c
Simple merge
diff --cc drivers/scsi/lpfc/lpfc_attr.c
Simple merge
diff --cc drivers/scsi/lpfc/lpfc_sli.c
Simple merge
diff --cc drivers/scsi/scsi_lib.c
Simple merge
author	James Bottomley <[email protected]>
	Tue, 7 Mar 2017 23:13:02 +0000 (15:13 -0800)
committer	James Bottomley <[email protected]>
	Tue, 7 Mar 2017 23:13:02 +0000 (15:13 -0800)
		1	2
drivers/scsi/libiscsi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_attr.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_sli.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	patch \|	diff1 \|	diff2 \|	blob \| history