From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Dec 2009 03:42:25 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Tag: v2.6.33-rc1~344
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=382f51fe2f2276344d8a21447656778cdf6583b6;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge git://git./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
  ...
---

382f51fe2f2276344d8a21447656778cdf6583b6
diff --cc MAINTAINERS
index c8973c6,d1a5cfd..f7b0ced
--- a/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/scsi/scsi_sysfs.c
index 392d8db,758598f..5a06505
--- a/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