Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This is mostly updates of the usual drivers: UFS, esp_scsi, NCR5380,
  qla2xxx, lpfc, libsas, hisi_sas.

  In addition there's a set of mostly small updates to the target
  subsystem a set of conversions to the generic DMA API, which do have
  some potential for issues in the older drivers but we'll handle those
  as case by case fixes.

  A new myrs driver for the DAC960/mylex raid controllers to replace the
  block based DAC960 which is also being removed by Jens in this merge
  window.

  Plus the usual slew of trivial changes"

[ "myrs" stands for "MYlex Raid Scsi". Obviously. Silly of me to even
  wonder. There's also a "myrb" driver, where the 'b' stands for
  'block'. Truly, somebody has got mad naming skillz. - Linus ]

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (237 commits)
  scsi: myrs: Fix the processor absent message in processor_show()
  scsi: myrs: Fix a logical vs bitwise bug
  scsi: hisi_sas: Fix NULL pointer dereference
  scsi: myrs: fix build failure on 32 bit
  scsi: fnic: replace gross legacy tag hack with blk-mq hack
  scsi: mesh: switch to generic DMA API
  scsi: ips: switch to generic DMA API
  scsi: smartpqi: fully convert to the generic DMA API
  scsi: vmw_pscsi: switch to generic DMA API
  scsi: snic: switch to generic DMA API
  scsi: qla4xxx: fully convert to the generic DMA API
  scsi: qla2xxx: fully convert to the generic DMA API
  scsi: qla1280: switch to generic DMA API
  scsi: qedi: fully convert to the generic DMA API
  scsi: qedf: fully convert to the generic DMA API
  scsi: pm8001: switch to generic DMA API
  scsi: nsp32: switch to generic DMA API
  scsi: mvsas: fully convert to the generic DMA API
  scsi: mvumi: switch to generic DMA API
  scsi: mpt3sas: switch to generic DMA API
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

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

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/csiostor/csio_init.c
Simple merge

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

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

diff --cc drivers/scsi/lpfc/lpfc.h
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_attr.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_debugfs.c
index aec5b10,d6e4cbf..0c8005b
--- 1/drivers/scsi/lpfc/lpfc_debugfs.c
--- 2/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@@ -550,8 -550,7 +550,7 @@@ lpfc_debugfs_nodelist_data(struct lpfc_
        struct lpfc_nodelist *ndlp;
        unsigned char *statep;
        struct nvme_fc_local_port *localport;
-       struct lpfc_nvmet_tgtport *tgtp;
 -      struct nvme_fc_remote_port *nrport;
 +      struct nvme_fc_remote_port *nrport = NULL;
        struct lpfc_nvme_rport *rport;
  
        cnt = (LPFC_NODELIST_SIZE / LPFC_NODELIST_ENTRY_SIZE);

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_nvme.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 86eaa89,4d73b5e..03c5284
--- 1/drivers/scsi/mpt3sas/mpt3sas_scsih.c
--- 2/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@@ -10826,8 -10644,9 +10644,8 @@@ scsih_pci_resume(struct pci_dev *pdev
        struct Scsi_Host *shost = pci_get_drvdata(pdev);
        struct MPT3SAS_ADAPTER *ioc = shost_priv(shost);
  
-       pr_info(MPT3SAS_FMT "PCI error: resume callback!!\n", ioc->name);
+       ioc_info(ioc, "PCI error: resume callback!!\n");
  
 -      pci_cleanup_aer_uncorrect_error_status(pdev);
        mpt3sas_base_start_watchdog(ioc);
        scsi_unblock_requests(ioc->shost);
  }

diff --cc drivers/scsi/qedi/qedi_main.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_target.h
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_os.c
Simple merge

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

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

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_login.c
Simple merge