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: (104 commits)
  [SCSI] fcoe: fix configuration problems
  [SCSI] cxgb3i: fix select/depend problem
  [SCSI] fcoe: fix incorrect use of struct module
  [SCSI] cxgb3i: remove use of skb->sp
  [SCSI] cxgb3i: Add cxgb3i iSCSI driver.
  [SCSI] zfcp: Remove unnecessary warning message
  [SCSI] zfcp: Add support for unchained FSF requests
  [SCSI] zfcp: Remove busid macro
  [SCSI] zfcp: remove DID_DID flag
  [SCSI] zfcp: Simplify mask lookups for incoming RSCNs
  [SCSI] zfcp: Remove initial device data from zfcp_data
  [SCSI] zfcp: fix compile warning
  [SCSI] zfcp: Remove adapter list
  [SCSI] zfcp: Simplify SBAL allocation to fix sparse warnings
  [SCSI] zfcp: register with SCSI layer on ccw registration
  [SCSI] zfcp: Fix message line break
  [SCSI] qla2xxx: changes in multiq code
  [SCSI] eata: fix the data buffer accessors conversion regression
  [SCSI] ibmvfc: Improve async event handling
  [SCSI] lpfc : correct printk types on PPC compiles
  ...

diff --combined drivers/ata/libata-scsi.c
index 0b2e14f67655510b68bdf772d8294b946f8c6782,b88e443027c43aef121245899350c644bd1f447e..4040d8b532165b791fef71902b44a5905e21303a
--- 1/drivers/ata/libata-scsi.c
--- 2/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@@ -517,7 -517,7 +517,7 @@@ int ata_cmd_ioctl(struct scsi_device *s
        /* Good values for timeout and retries?  Values below
           from scsi_ioctl_send_command() for default case... */
        cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,
-                                 sensebuf, (10*HZ), 5, 0);
+                                 sensebuf, (10*HZ), 5, 0, NULL);
  
        if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
                u8 *desc = sensebuf + 8;
@@@ -603,7 -603,7 +603,7 @@@ int ata_task_ioctl(struct scsi_device *
        /* Good values for timeout and retries?  Values below
           from scsi_ioctl_send_command() for default case... */
        cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,
-                               sensebuf, (10*HZ), 5, 0);
+                               sensebuf, (10*HZ), 5, 0, NULL);
  
        if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
                u8 *desc = sensebuf + 8;
@@@ -3229,12 -3229,12 +3229,12 @@@ void ata_scsi_scan_host(struct ata_por
                return;
  
   repeat:
 -      ata_port_for_each_link(link, ap) {
 -              ata_link_for_each_dev(dev, link) {
 +      ata_for_each_link(link, ap, EDGE) {
 +              ata_for_each_dev(dev, link, ENABLED) {
                        struct scsi_device *sdev;
                        int channel = 0, id = 0;
  
 -                      if (!ata_dev_enabled(dev) || dev->sdev)
 +                      if (dev->sdev)
                                continue;
  
                        if (ata_is_host_link(link))
@@@ -3255,9 -3255,9 +3255,9 @@@
         * failure occurred, scan would have failed silently.  Check
         * whether all devices are attached.
         */
 -      ata_port_for_each_link(link, ap) {
 -              ata_link_for_each_dev(dev, link) {
 -                      if (ata_dev_enabled(dev) && !dev->sdev)
 +      ata_for_each_link(link, ap, EDGE) {
 +              ata_for_each_dev(dev, link, ENABLED) {
 +                      if (!dev->sdev)
                                goto exit_loop;
                }
        }
@@@ -3381,7 -3381,7 +3381,7 @@@ static void ata_scsi_handle_link_detach
        struct ata_port *ap = link->ap;
        struct ata_device *dev;
  
 -      ata_link_for_each_dev(dev, link) {
 +      ata_for_each_dev(dev, link, ALL) {
                unsigned long flags;
  
                if (!(dev->flags & ATA_DFLAG_DETACHED))
@@@ -3496,7 -3496,7 +3496,7 @@@ static int ata_scsi_user_scan(struct Sc
        if (devno == SCAN_WILD_CARD) {
                struct ata_link *link;
  
 -              ata_port_for_each_link(link, ap) {
 +              ata_for_each_link(link, ap, EDGE) {
                        struct ata_eh_info *ehi = &link->eh_info;
                        ehi->probe_mask |= ATA_ALL_DEVICES;
                        ehi->action |= ATA_EH_RESET;
@@@ -3544,11 -3544,11 +3544,11 @@@ void ata_scsi_dev_rescan(struct work_st
  
        spin_lock_irqsave(ap->lock, flags);
  
 -      ata_port_for_each_link(link, ap) {
 -              ata_link_for_each_dev(dev, link) {
 +      ata_for_each_link(link, ap, EDGE) {
 +              ata_for_each_dev(dev, link, ENABLED) {
                        struct scsi_device *sdev = dev->sdev;
  
 -                      if (!ata_dev_enabled(dev) || !sdev)
 +                      if (!sdev)
                                continue;
                        if (scsi_device_get(sdev))
                                continue;