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

SCSI updates from James Bottomley:
 "The update includes the usual assortment of driver updates (lpfc,
  qla2xxx, qla4xxx, bfa, bnx2fc, bnx2i, isci, fcoe, hpsa) plus a huge
  amount of infrastructure work in the SAS library and transport class
  as well as an iSCSI update.  There's also a new SCSI based virtio
  driver."

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (177 commits)
  [SCSI] qla4xxx: Update driver version to 5.02.00-k15
  [SCSI] qla4xxx: trivial cleanup
  [SCSI] qla4xxx: Fix sparse warning
  [SCSI] qla4xxx: Add support for multiple session per host.
  [SCSI] qla4xxx: Export CHAP index as sysfs attribute
  [SCSI] scsi_transport: Export CHAP index as sysfs attribute
  [SCSI] qla4xxx: Add support to display CHAP list and delete CHAP entry
  [SCSI] iscsi_transport: Add support to display CHAP list and delete CHAP entry
  [SCSI] pm8001: fix endian issue with code optimization.
  [SCSI] pm8001: Fix possible racing condition.
  [SCSI] pm8001: Fix bogus interrupt state flag issue.
  [SCSI] ipr: update PCI ID definitions for new adapters
  [SCSI] qla2xxx: handle default case in qla2x00_request_firmware()
  [SCSI] isci: improvements in driver unloading routine
  [SCSI] isci: improve phy event warnings
  [SCSI] isci: debug, provide state-enum-to-string conversions
  [SCSI] scsi_transport_sas: 'enable' phys on reset
  [SCSI] libsas: don't recover end devices attached to disabled phys
  [SCSI] libsas: fixup target_port_protocols for expanders that don't report sata
  [SCSI] libsas: set attached device type and target protocols for local phys
  ...

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/Makefile
index e4c1a69f8fab94abcf012a705d9c7471a21a1922,351b28b3d7df583a27b07985364628fcea427430..ad24e065b1e553c4efd620e6aa161362cf1e40dc
--- 1/drivers/scsi/Makefile
--- 2/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@@ -141,8 -141,8 +141,9 @@@ obj-$(CONFIG_SCSI_CXGB4_ISCSI)     += libis
  obj-$(CONFIG_SCSI_BNX2_ISCSI) += libiscsi.o bnx2i/
  obj-$(CONFIG_BE2ISCSI)                += libiscsi.o be2iscsi/
  obj-$(CONFIG_SCSI_PMCRAID)    += pmcraid.o
+ obj-$(CONFIG_SCSI_VIRTIO)     += virtio_scsi.o
  obj-$(CONFIG_VMWARE_PVSCSI)   += vmw_pvscsi.o
 +obj-$(CONFIG_HYPERV_STORAGE)  += hv_storvsc.o
  
  obj-$(CONFIG_ARM)             += arm/
  

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

diff --cc drivers/scsi/cxgbi/libcxgbi.c
Simple merge

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

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

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

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

diff --cc drivers/scsi/libfc/fc_lport.c
Simple merge

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

diff --cc drivers/scsi/libsas/sas_host_smp.c
Simple merge

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

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

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

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

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

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

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

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