From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Oct 2011 23:44:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ec7ae517537ae5c7b0b2cd7f562dfa3e7a05b954;p=linux-beck.git

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
  ...
---

ec7ae517537ae5c7b0b2cd7f562dfa3e7a05b954
diff --cc drivers/scsi/qla4xxx/Kconfig
index 0f5599e0abf6,5b1aed4f0754..f1ad02ea212b
--- a/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.