Merge remote-tracking branch 'scsi/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 06:05:55 +0000 (17:05 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 06:05:55 +0000 (17:05 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 06:05:55 +0000 (17:05 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 06:05:55 +0000 (17:05 +1100)
diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge
diff --cc drivers/scsi/bnx2i/bnx2i_hwi.c
Simple merge
diff --cc drivers/scsi/libsas/sas_ata.c
Simple merge
diff --cc drivers/scsi/libsas/sas_scsi_host.c
Simple merge
diff --cc drivers/scsi/qedi/qedi_main.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 06:05:55 +0000 (17:05 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 06:05:55 +0000 (17:05 +1100)
		1	2
drivers/infiniband/ulp/srpt/ib_srpt.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bnx2i/bnx2i_hwi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libsas/sas_ata.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libsas/sas_scsi_host.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_main.c	patch \|	diff1 \|	diff2 \|	blob \| history