Merge HEAD from ../scsi-iscsi-2.6

diff --combined drivers/scsi/Kconfig
index 2d21265e650b2abc0d79bd1f2c50ef212d9b977b,ff105c7b966cb5a782d4b2a188c79c31215813b6..1c60c568e91167e5e1d964095f253ca1c59b3d59
--- 1/drivers/scsi/Kconfig
--- 2/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@@ -1,11 -1,5 +1,11 @@@
  menu "SCSI device support"
  
 +config RAID_ATTRS
 +      tristate "RAID Transport Class"
 +      default n
 +      ---help---
 +        Provides RAID
 +
  config SCSI
        tristate "SCSI device support"
        ---help---
@@@ -229,12 -223,35 +229,35 @@@ config SCSI_FC_ATTR
  
  config SCSI_ISCSI_ATTRS
        tristate "iSCSI Transport Attributes"
-       depends on SCSI
+       depends on SCSI && NET
        help
          If you wish to export transport-specific information about
          each attached iSCSI device to sysfs, say Y.
          Otherwise, say N.
  
+ config ISCSI_TCP
+       tristate "iSCSI Initiator over TCP/IP"
+       depends on SCSI && INET && SCSI_ISCSI_ATTRS
+       select CRYPTO
+       select CRYPTO_MD5
+       select CRYPTO_CRC32C
+       help
+        The iSCSI Driver provides a host with the ability to access storage
+        through an IP network. The driver uses the iSCSI protocol to transport
+        SCSI requests and responses over a TCP/IP network between the host
+        (the "initiator") and "targets".  Architecturally, the iSCSI driver
+        combines with the host's TCP/IP stack, network drivers, and Network
+        Interface Card (NIC) to provide the same functions as a SCSI or a
+        Fibre Channel (FC) adapter driver with a Host Bus Adapter (HBA).
+ 
+        To compile this driver as a module, choose M here: the
+        module will be called iscsi_tcp.
+ 
+        The userspace component needed to initialize the driver, documentation,
+        and sample configuration files can be found here:
+ 
+        http://linux-iscsi.sf.net
+ 
  endmenu
  
  menu "SCSI low-level drivers"
@@@ -256,7 -273,7 +279,7 @@@ config SCSI_DECNC
  
  config SCSI_DECSII
        tristate "DEC SII Scsi Driver"
 -      depends on MACH_DECSTATION && SCSI && MIPS32
 +      depends on MACH_DECSTATION && SCSI && 32BIT
  
  config BLK_DEV_3W_XXXX_RAID
        tristate "3ware 5/6/7/8xxx ATA-RAID support"
@@@ -465,15 -482,6 +488,15 @@@ config SCSI_ATA_PII
  
          If unsure, say N.
  
 +config SCSI_SATA_MV
 +      tristate "Marvell SATA support"
 +      depends on SCSI_SATA && PCI && EXPERIMENTAL
 +      help
 +        This option enables support for the Marvell Serial ATA family.
 +        Currently supports 88SX[56]0[48][01] chips.
 +
 +        If unsure, say N.
 +
  config SCSI_SATA_NV
        tristate "NVIDIA SATA support"
        depends on SCSI_SATA && PCI && EXPERIMENTAL
@@@ -1711,7 -1719,7 +1734,7 @@@ config TT_DMA_EMU
  
  config MAC_SCSI
        bool "Macintosh NCR5380 SCSI"
 -      depends on MAC && SCSI
 +      depends on MAC && SCSI=y
        help
          This is the NCR 5380 SCSI controller included on most of the 68030
          based Macintoshes.  If you have one of these say Y and read the
@@@ -1732,7 -1740,7 +1755,7 @@@ config SCSI_MAC_ES
  
  config MVME147_SCSI
        bool "WD33C93 SCSI driver for MVME147"
 -      depends on MVME147 && SCSI
 +      depends on MVME147 && SCSI=y
        help
          Support for the on-board SCSI controller on the Motorola MVME147
          single-board computer.
@@@ -1773,7 -1781,7 +1796,7 @@@ config SUN3_SCS
  
  config SUN3X_ESP
        bool "Sun3x ESP SCSI"
 -      depends on SUN3X && SCSI
 +      depends on SUN3X && SCSI=y
        help
          The ESP was an on-board SCSI controller used on Sun 3/80
          machines.  Say Y here to compile in support for it.

diff --combined drivers/scsi/Makefile
index 4b4fd94c2674cf6f3ac0b6c727ef2cd52f3d7be1,e11220a23cc633153ea86b68fdc01e3170df77de..2349f902b48a158125f0c701f53e6c03112c58da
--- 1/drivers/scsi/Makefile
--- 2/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@@ -22,8 -22,6 +22,8 @@@ subdir-$(CONFIG_PCMCIA)               += pcmci
  
  obj-$(CONFIG_SCSI)            += scsi_mod.o
  
 +obj-$(CONFIG_RAID_ATTRS)      += raid_class.o
 +
  # --- NOTE ORDERING HERE ---
  # For kernel non-modular link, transport attributes need to
  # be initialised before drivers
@@@ -32,6 -30,7 +32,7 @@@ obj-$(CONFIG_SCSI_SPI_ATTRS)  += scsi_tr
  obj-$(CONFIG_SCSI_FC_ATTRS)   += scsi_transport_fc.o
  obj-$(CONFIG_SCSI_ISCSI_ATTRS)        += scsi_transport_iscsi.o
  
+ obj-$(CONFIG_ISCSI_TCP)       += iscsi_tcp.o
  obj-$(CONFIG_SCSI_AMIGA7XX)   += amiga7xx.o   53c7xx.o
  obj-$(CONFIG_A3000_SCSI)      += a3000.o      wd33c93.o
  obj-$(CONFIG_A2091_SCSI)      += a2091.o      wd33c93.o
@@@ -134,7 -133,6 +135,7 @@@ obj-$(CONFIG_SCSI_SATA_SIS)        += libata.
  obj-$(CONFIG_SCSI_SATA_SX4)   += libata.o sata_sx4.o
  obj-$(CONFIG_SCSI_SATA_NV)    += libata.o sata_nv.o
  obj-$(CONFIG_SCSI_SATA_ULI)   += libata.o sata_uli.o
 +obj-$(CONFIG_SCSI_SATA_MV)    += libata.o sata_mv.o
  
  obj-$(CONFIG_ARM)             += arm/