From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2011 00:54:40 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c55d267de274d308927b60c3e740c1a826832317;p=openwrt%2Fstaging%2Fblogic.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: (170 commits)
  [SCSI] scsi_dh_rdac: Add MD36xxf into device list
  [SCSI] scsi_debug: add consecutive medium errors
  [SCSI] libsas: fix ata list corruption issue
  [SCSI] hpsa: export resettable host attribute
  [SCSI] hpsa: move device attributes to avoid forward declarations
  [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
  [SCSI] sd: Logical Block Provisioning update
  [SCSI] Include protection operation in SCSI command trace
  [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
  [SCSI] target: Fix volume size misreporting for volumes > 2TB
  [SCSI] bnx2fc: Broadcom FCoE offload driver
  [SCSI] fcoe: fix broken fcoe interface reset
  [SCSI] fcoe: precedence bug in fcoe_filter_frames()
  [SCSI] libfcoe: Remove stale fcoe-netdev entries
  [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
  [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
  [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
  [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
  [SCSI] libfc: Fixing a memory leak when destroying an interface
  [SCSI] megaraid_sas: Version and Changelog update
  ...

Fix up trivial conflicts due to whitespace differences in
drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}
---

c55d267de274d308927b60c3e740c1a826832317
diff --cc drivers/scsi/libsas/sas_scsi_host.c
index 67758ea8eb7f,2119871aed3e..f6e189f40917
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@@ -685,8 -684,8 +685,7 @@@ enum blk_eh_timer_return sas_scsi_timed
  
  	if (sas_ata_timed_out(cmd, task, &rtn))
  		return rtn;
- 	
  
 -
  	if (!task) {
  		cmd->request->timeout /= 2;
  		SAS_DPRINTK("command 0x%p, task 0x%p, gone: %s\n",