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

Pull SCSI updates from James Bottomley:
 "This is the usual grab bag of driver updates (lpfc, hpsa,
  megaraid_sas, cxgbi, be2iscsi) plus an assortment of minor updates.

  There is also one new driver: the Cisco snic.  The advansys driver has
  been rewritten to get rid of the warning about converting it to the
  DMA API, the tape statistics patch got in and finally, there's a
  resuffle of SCSI header files to separate more cleanly initiator from
  target mode (and better share the common definitions)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (156 commits)
  snic: driver for Cisco SCSI HBA
  qla2xxx: Fix indentation
  qla2xxx: Comment out unreachable code
  fusion: remove dead MTRR code
  advansys: fix compilation errors and warnings when CONFIG_PCI is not set
  mptsas: fix depth param in scsi_track_queue_full
  megaraid: fix irq setup process regression
  lpfc: Update version to 10.7.0.0 for upstream patch set.
  lpfc: Fix to drop PLOGIs from fabric node till LOGO processing completes
  lpfc: Fix scsi task management error message.
  lpfc: Fix cq_id masking problem.
  lpfc: Fix scsi prep dma buf error.
  lpfc: Add support for using block multi-queue
  lpfc: Devices are not discovered during takeaway/giveback testing
  lpfc: Fix vport deletion failure.
  lpfc: Check for active portpeerbeacon.
  lpfc: Update driver version for upstream patch set 10.6.0.1.
  lpfc: Change buffer pool empty message to miscellaneous category
  lpfc: Fix incorrect log message reported for empty FCF record.
  lpfc: Fix rport leak.
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

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

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

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

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

diff --cc drivers/target/target_core_alua.c
Simple merge

diff --cc drivers/target/target_core_device.c
index ce5f768181ff6593a7afac365214c77b0f0aceab,2dd7ea373c5872b35703b44e71dac8984e186de3..417f88b498c72585570398f6f783850c5473bd67
--- 1/drivers/target/target_core_device.c
--- 2/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@@ -33,11 -33,10 +33,11 @@@
  #include <linux/kthread.h>
  #include <linux/in.h>
  #include <linux/export.h>
 +#include <asm/unaligned.h>
  #include <net/sock.h>
  #include <net/tcp.h>
- #include <scsi/scsi.h>
- #include <scsi/scsi_device.h>
+ #include <scsi/scsi_common.h>
+ #include <scsi/scsi_proto.h>
  
  #include <target/target_core_base.h>
  #include <target/target_core_backend.h>

diff --cc drivers/target/target_core_file.c
Simple merge

diff --cc drivers/target/target_core_iblock.c
Simple merge

diff --cc drivers/target/target_core_pr.c
Simple merge

diff --cc drivers/target/target_core_pscsi.c
Simple merge

diff --cc drivers/target/target_core_pscsi.h
Simple merge

diff --cc drivers/target/target_core_rd.c
Simple merge

diff --cc drivers/target/target_core_sbc.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/target/target_core_user.c
Simple merge

diff --cc drivers/target/target_core_xcopy.c
Simple merge

diff --cc drivers/usb/gadget/legacy/tcm_usb_gadget.c
Simple merge

diff --cc drivers/usb/storage/uas.c
Simple merge

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

diff --cc include/linux/libata.h
Simple merge