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

Pull SCSI updates from James Bottomley:
 "This consists of a small set of driver updates (lpfc, ufs, mpt3sas
  mpi3mr, iscsi target). Apart from that this is mostly small fixes with
  very few core changes (the biggest one being VPD caching)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (177 commits)
  scsi: target: tcmu: Avoid holding XArray lock when calling lock_page
  scsi: elx: efct: Remove NULL check after calling container_of()
  scsi: dpt_i2o: Drop redundant spinlock initialization
  scsi: qedf: Remove redundant variable op
  scsi: hisi_sas: Fix memory ordering in hisi_sas_task_deliver()
  scsi: fnic: Replace DMA mask of 64 bits with 47 bits
  scsi: mpi3mr: Add target device related sysfs attributes
  scsi: mpi3mr: Add shost related sysfs attributes
  scsi: elx: efct: Remove redundant memset() statement
  scsi: megaraid_sas: Remove redundant memset() statement
  scsi: mpi3mr: Return error if dma_alloc_coherent() fails
  scsi: hisi_sas: Fix rescan after deleting a disk
  scsi: hisi_sas: Use sas_ata_wait_after_reset() in IT nexus reset
  scsi: libsas: Refactor sas_ata_hard_reset()
  scsi: mpt3sas: Update driver version to 42.100.00.00
  scsi: mpt3sas: Fix junk chars displayed while printing ChipName
  scsi: ipr: Use kobj_to_dev()
  scsi: mpi3mr: Fix a NULL vs IS_ERR() bug in mpi3mr_bsg_init()
  scsi: bnx2fc: Avoid using get_cpu() in bnx2fc_cmd_alloc()
  scsi: libfc: Remove get_cpu() semantics in fc_exch_em_alloc()
  ...

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

diff --cc drivers/scsi/fcoe/fcoe_ctlr.c
Simple merge

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

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

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

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

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

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

diff --cc drivers/target/iscsi/iscsi_target.c
index ddf6c2a7212bc5993551b9a5bbd07964843e857c,d425cc386d878efa16a6935a0862ac746675661d..e368f038ff5c0f36ce8c6e858a34e24465d68505
--- 1/drivers/target/iscsi/iscsi_target.c
--- 2/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@@ -3593,10 -3593,13 +3593,10 @@@ static int iscsit_send_reject
                                                     ISCSI_HDR_LEN);
  }
  
- void iscsit_thread_get_cpumask(struct iscsi_conn *conn)
+ void iscsit_thread_get_cpumask(struct iscsit_conn *conn)
  {
        int ord, cpu;
 -      cpumask_t conn_allowed_cpumask;
 -
 -      cpumask_and(&conn_allowed_cpumask, iscsit_global->allowed_cpumask,
 -                  cpu_online_mask);
 +      cpumask_var_t conn_allowed_cpumask;
  
        /*
         * bitmap_id is assigned from iscsit_global->ts_bitmap from

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

diff --cc include/scsi/libfcoe.h
Simple merge