Merge tag '4.4-scsi-mkp' into misc

SCSI queue for 4.4.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --cc drivers/scsi/aic94xx/aic94xx_init.c
Simple merge

diff --cc drivers/scsi/be2iscsi/be_main.c
Simple merge

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

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

diff --cc drivers/scsi/isci/init.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/mvsas/mv_init.c
Simple merge

diff --cc drivers/scsi/pm8001/pm8001_init.c
Simple merge

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

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

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

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge