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: (222 commits)
  [SCSI] zfcp: Remove flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP
  [SCSI] zfcp: Activate fc4s attributes for zfcp in FC transport class
  [SCSI] zfcp: Block scsi_eh thread for rport state BLOCKED
  [SCSI] zfcp: Update FSF error reporting
  [SCSI] zfcp: Improve ELS ADISC handling
  [SCSI] zfcp: Simplify handling of ct and els requests
  [SCSI] zfcp: Remove ZFCP_DID_MASK
  [SCSI] zfcp: Move WKA port to zfcp FC code
  [SCSI] zfcp: Use common code definitions for FC CT structs
  [SCSI] zfcp: Use common code definitions for FC ELS structs
  [SCSI] zfcp: Update FCP protocol related code
  [SCSI] zfcp: Dont fail SCSI commands when transitioning to blocked fc_rport
  [SCSI] zfcp: Assign scheduled work to driver queue
  [SCSI] zfcp: Remove STATUS_COMMON_REMOVE flag as it is not required anymore
  [SCSI] zfcp: Implement module unloading
  [SCSI] zfcp: Merge trace code for fsf requests in one function
  [SCSI] zfcp: Access ports and units with container_of in sysfs code
  [SCSI] zfcp: Remove suspend callback
  [SCSI] zfcp: Remove global config_mutex
  [SCSI] zfcp: Replace local reference counting with common kref
  ...

diff --cc MAINTAINERS
index c8973c6102d8e730dc588fb84908f5092fa80f53,d1a5cfd2c379094a7b92a35367d2fe65e3fb8a91..f7b0ced81116bdd02a0535270ff5efc9e5231600
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5766,12 -5690,20 +5773,20 @@@ F:   drivers/vlynq/vlynq.
  F:    include/linux/vlynq.h
  
  VMWARE VMXNET3 ETHERNET DRIVER
 -M:     Shreyas Bhatewara <sbhatewara@vmware.com>
 -M:     VMware, Inc. <pv-drivers@vmware.com>
 -L:     netdev@vger.kernel.org
 -S:     Maintained
 -F:     drivers/net/vmxnet3/
 +M:    Shreyas Bhatewara <sbhatewara@vmware.com>
 +M:    "VMware, Inc." <pv-drivers@vmware.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/vmxnet3/
  
+ VMware PVSCSI driver
+ M:    Alok Kataria <akataria@vmware.com>
+ M:    VMware PV-Drivers <pv-drivers@vmware.com>
+ L:    linux-scsi@vger.kernel.org
+ S:    Maintained
+ F:    drivers/scsi/vmw_pvscsi.c
+ F:    drivers/scsi/vmw_pvscsi.h
+ 
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <lrg@slimlogic.co.uk>
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>

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

diff --cc drivers/scsi/bfa/bfad_fwimg.c
Simple merge

diff --cc drivers/scsi/bfa/bfad_im.c
Simple merge

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

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

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

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

diff --cc drivers/scsi/scsi_sysfs.c
index 392d8db33905cbe31f1e2f96644552d9b692eb27,758598ff3b9002afbf98b112cb03a2614a31237a..5a065055e68af76e9a61bdfe9c31da9a16842719
--- 1/drivers/scsi/scsi_sysfs.c
--- 2/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@@ -860,20 -895,22 +894,24 @@@ int scsi_sysfs_add_sdev(struct scsi_dev
        error = device_add(&sdev->sdev_dev);
        if (error) {
                printk(KERN_INFO "error 2\n");
 -              goto clean_device;
 +              device_del(&sdev->sdev_gendev);
 +              goto out_remove;
        }
 +      transport_add_device(&sdev->sdev_gendev);
 +      sdev->is_visible = 1;
  
        /* create queue files, which may be writable, depending on the host */
-       if (sdev->host->hostt->change_queue_depth)
-               error = device_create_file(&sdev->sdev_gendev, &sdev_attr_queue_depth_rw);
+       if (sdev->host->hostt->change_queue_depth) {
+               error = device_create_file(&sdev->sdev_gendev,
+                                          &sdev_attr_queue_depth_rw);
+               error = device_create_file(&sdev->sdev_gendev,
+                                          &sdev_attr_queue_ramp_up_period);
+       }
        else
                error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_depth);
 -      if (error) {
 -              __scsi_remove_device(sdev);
 -              goto out;
 -      }
 +      if (error)
 +              goto out_remove;
 +
        if (sdev->host->hostt->change_queue_type)
                error = device_create_file(&sdev->sdev_gendev, &sdev_attr_queue_type_rw);
        else

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

diff --cc include/linux/libata.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/scsi/scsi_device.h
Simple merge

diff --cc include/scsi/scsi_host.h
Simple merge