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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (166 commits)
  [SCSI] ibmvscsi: convert to use the data buffer accessors
  [SCSI] dc395x: convert to use the data buffer accessors
  [SCSI] ncr53c8xx: convert to use the data buffer accessors
  [SCSI] sym53c8xx: convert to use the data buffer accessors
  [SCSI] ppa: coding police and printk levels
  [SCSI] aic7xxx_old: remove redundant GFP_ATOMIC from kmalloc
  [SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
  [SCSI] remove the dead CYBERSTORMIII_SCSI option
  [SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
  [SCSI] Clean up scsi_add_lun a bit
  [SCSI] 53c700: Remove printk, which triggers because of low scsi clock on SNI RMs
  [SCSI] sni_53c710: Cleanup
  [SCSI] qla4xxx: Fix underrun/overrun conditions
  [SCSI] megaraid_mbox: use mutex instead of semaphore
  [SCSI] aacraid: add 51245, 51645 and 52245 adapters to documentation.
  [SCSI] qla2xxx: update version to 8.02.00-k1.
  [SCSI] qla2xxx: add support for NPIV
  [SCSI] stex: use resid for xfer len information
  [SCSI] Add Brownie 1200U3P to blacklist
  [SCSI] scsi.c: convert to use the data buffer accessors
  ...

diff --cc drivers/ieee1394/sbp2.c
Simple merge

diff --cc drivers/message/fusion/mptspi.c
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

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

diff --cc drivers/scsi/aacraid/linit.c
Simple merge

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

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

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

diff --cc drivers/scsi/lpfc/lpfc_attr.c
index 5dfda9778c80b009b03ca242d23c0d9614099631,6a2c1ac42442c69b69c68192da5b84fc8887d075..860a52c090f408fb4bbdccad73675a72bc78a361
--- 1/drivers/scsi/lpfc/lpfc_attr.c
--- 2/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@@ -1133,13 -1405,14 +1405,15 @@@ struct class_device_attribute *lpfc_hba
  };
  
  static ssize_t
 -sysfs_ctlreg_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
 +sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr,
 +                 char *buf, loff_t off, size_t count)
  {
        size_t buf_off;
-       struct Scsi_Host *host = class_to_shost(container_of(kobj,
-                                            struct class_device, kobj));
-       struct lpfc_hba *phba = (struct lpfc_hba*)host->hostdata;
+       struct class_device *cdev = container_of(kobj, struct class_device,
+                                                kobj);
+       struct Scsi_Host  *shost = class_to_shost(cdev);
+       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
  
        if ((off + count) > FF_REG_AREA_SIZE)
                return -ERANGE;
@@@ -1223,13 -1496,14 +1497,15 @@@ sysfs_mbox_idle(struct lpfc_hba *phba
  }
  
  static ssize_t
 -sysfs_mbox_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
 +sysfs_mbox_write(struct kobject *kobj, struct bin_attribute *bin_attr,
 +               char *buf, loff_t off, size_t count)
  {
-       struct Scsi_Host * host =
-               class_to_shost(container_of(kobj, struct class_device, kobj));
-       struct lpfc_hba * phba = (struct lpfc_hba*)host->hostdata;
-       struct lpfcMboxq * mbox = NULL;
+       struct class_device *cdev = container_of(kobj, struct class_device,
+                                                kobj);
+       struct Scsi_Host  *shost = class_to_shost(cdev);
+       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
+       struct lpfcMboxq  *mbox = NULL;
  
        if ((count + off) > MAILBOX_CMD_SIZE)
                return -ERANGE;
@@@ -1276,13 -1550,13 +1552,14 @@@
  }
  
  static ssize_t
 -sysfs_mbox_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
 +sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,
 +              char *buf, loff_t off, size_t count)
  {
-       struct Scsi_Host *host =
-               class_to_shost(container_of(kobj, struct class_device,
-                                           kobj));
-       struct lpfc_hba *phba = (struct lpfc_hba*)host->hostdata;
+       struct class_device *cdev = container_of(kobj, struct class_device,
+                                                kobj);
+       struct Scsi_Host  *shost = class_to_shost(cdev);
+       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
        int rc;
  
        if (off > MAILBOX_CMD_SIZE)

diff --cc drivers/scsi/lpfc/lpfc_init.c
index 955b2e48d04192579615d6030311e43688b2aae9,4a50e0a21470ae17ef9847d855610df449ecc473..f81f85ee190f1cd2cb8e0597ac2d5a6c7ffab2e5
--- 1/drivers/scsi/lpfc/lpfc_init.c
--- 2/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@@ -1559,26 -1759,19 +1759,16 @@@ lpfc_pci_probe_one(struct pci_dev *pdev
        psli = &phba->sli;
        init_timer(&psli->mbox_tmo);
        psli->mbox_tmo.function = lpfc_mbox_timeout;
-       psli->mbox_tmo.data = (unsigned long)phba;
- 
+       psli->mbox_tmo.data = (unsigned long) phba;
        init_timer(&phba->fcp_poll_timer);
        phba->fcp_poll_timer.function = lpfc_poll_timeout;
-       phba->fcp_poll_timer.data = (unsigned long)phba;
- 
-       /*
-        * Get all the module params for configuring this host and then
-        * establish the host parameters.
-        */
-       lpfc_get_cfgparam(phba);
- 
-       host->max_id = LPFC_MAX_TARGET;
-       host->max_lun = phba->cfg_max_luns;
-       host->this_id = -1;
- 
-       INIT_LIST_HEAD(&phba->fc_nodes);
+       phba->fcp_poll_timer.data = (unsigned long) phba;
+       init_timer(&phba->fabric_block_timer);
+       phba->fabric_block_timer.function = lpfc_fabric_block_timeout;
+       phba->fabric_block_timer.data = (unsigned long) phba;
  
        pci_set_master(pdev);
 -      retval = pci_set_mwi(pdev);
 -      if (retval)
 -              dev_printk(KERN_WARNING, &pdev->dev,
 -                         "Warning: pci_set_mwi returned %d\n", retval);
 +      pci_try_set_mwi(pdev);
  
        if (pci_set_dma_mask(phba->pcidev, DMA_64BIT_MASK) != 0)
                if (pci_set_dma_mask(phba->pcidev, DMA_32BIT_MASK) != 0)

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

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

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

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

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