Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits)
  [SCSI] qla4xxx: export address/port of connection (fix udev disk names)
  [SCSI] ipr: Fix BUG on adapter dump timeout
  [SCSI] megaraid_sas: Fix instance access in megasas_reset_timer
  [SCSI] hpsa: change confusing message to be more clear
  [SCSI] iscsi class: fix vlan configuration
  [SCSI] qla4xxx: fix data alignment and use nl helpers
  [SCSI] iscsi class: fix link local mispelling
  [SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA
  [SCSI] aacraid: use lower snprintf() limit
  [SCSI] lpfc 8.3.27: Change driver version to 8.3.27
  [SCSI] lpfc 8.3.27: T10 additions for SLI4
  [SCSI] lpfc 8.3.27: Fix queue allocation failure recovery
  [SCSI] lpfc 8.3.27: Change algorithm for getting physical port name
  [SCSI] lpfc 8.3.27: Changed worst case mailbox timeout
  [SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes
  [SCSI] megaraid_sas: Changelog and version update
  [SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic
  [SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support
  [SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers
  [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts
  ...

diff --cc arch/s390/include/asm/qdio.h
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/s390/cio/qdio_main.c
Simple merge

diff --cc drivers/s390/cio/qdio_setup.c
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/Makefile
Simple merge

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

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

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

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

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

diff --cc drivers/scsi/cxgbi/libcxgbi.h
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/phy.c
Simple merge

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

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

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

diff --cc drivers/scsi/mpt2sas/mpt2sas_base.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_ctl.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge

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

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

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

diff --cc drivers/scsi/qla4xxx/Kconfig
index 0f5599e0abf6a6d362e0f94312faaa7abe3ea2a7,5b1aed4f0754639c27444a9886d495f5a71d014a..f1ad02ea212b6331f16619ca8de821b97da977de
--- 1/drivers/scsi/qla4xxx/Kconfig
--- 2/drivers/scsi/qla4xxx/Kconfig
+++ b/drivers/scsi/qla4xxx/Kconfig
@@@ -1,7 -1,8 +1,8 @@@
  config SCSI_QLA_ISCSI
        tristate "QLogic ISP4XXX and ISP82XX host adapter family support"
 -      depends on PCI && SCSI
 +      depends on PCI && SCSI && NET
        select SCSI_ISCSI_ATTRS
+       select ISCSI_BOOT_SYSFS
        ---help---
        This driver supports the QLogic 40xx (ISP4XXX) and 8022 (ISP82XX)
        iSCSI host adapter family.