Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4326635 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] megaraid_sas: intercept cmd timeout and throttle io
  [SCSI] fusion: Fix |/|| confusion
  [SCSI] aic94xx: asd_clear_nexus should fail if the cleared task does not complete
  [SCSI] aic7xxx: fix aicasm build failure with gcc-3.4.6
  [SCSI] aacraid: apply commit config for reset_devices flag
  [SCSI] sd: fix refcounting regression in suspend/resume routines
  [SCSI] aacraid: fix panic on short Inquiry
  [SCSI] aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-2.6.21.1)
  [SCSI] NCR53C9x: correct spelling mistake in deprecation notice
  [SCSI] tgt: fix a rdma indirect transfer error bug
  [SCSI] MegaRAID: Update MAINTAINERS email-id
  [SCSI] stex: minor cleanup and version update
  [SCSI] stex: fix reset recovery for console device
  [SCSI] stex: extend hard reset wait time
  [SCSI] stex: fix id mapping issue
  [SCSI] ipr: Proper return codes for eh_dev_reset for SATA devices
  [SCSI] zfcp: IO stall after deleting and path checker changes after reenabling zfcp devices
  [SCSI] zfcp: avoid clutter in erp_dbf
parents d5d4db70 05e9ebbe

Documentation/feature-removal-schedule.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de> 
What:	old NCR53C9x driver

When:	October 2007

Why:	Replaced by the much better esp_scsi driver.  Actual low-level

	driver can ported over almost trivially.

	driver can be ported over almost trivially.

Who:	David Miller <davem@davemloft.net>

	Christoph Hellwig <hch@lst.de>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2334,7 +2334,7 @@ S: Maintained 


MEGARAID SCSI DRIVERS

P:	Neela Syam Kolli

M:	Neela.Kolli@engenio.com

M:	megaraidlinux@lsi.com

S:	linux-scsi@vger.kernel.org

W:	http://megaraid.lsilogic.com

S:	Maintained

drivers/message/fusion/mptbase.h

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ typedef struct _MPT_SAS_MGMT { 
typedef struct _mpt_ioctl_events {

	u32	event;		/* Specified by define above */

	u32	eventContext;	/* Index or counter */

	int	data[2];	/* First 8 bytes of Event Data */

	u32	data[2];	/* First 8 bytes of Event Data */

} MPT_IOCTL_EVENTS;



/*

drivers/message/fusion/mptscsih.c

+4 −4
Original line number Diff line number Diff line
@@ -2463,11 +2463,11 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR 
				ioc->events[idx].event = MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE;

				ioc->events[idx].eventContext = ioc->eventContext;



				ioc->events[idx].data[0] = (pReq->LUN[1] << 24) ||

					(MPI_EVENT_SCSI_DEV_STAT_RC_SMART_DATA << 16) ||

					(sc->device->channel << 8) || sc->device->id;

				ioc->events[idx].data[0] = (pReq->LUN[1] << 24) |

					(MPI_EVENT_SCSI_DEV_STAT_RC_SMART_DATA << 16) |

					(sc->device->channel << 8) | sc->device->id;



				ioc->events[idx].data[1] = (sense_data[13] << 8) || sense_data[12];

				ioc->events[idx].data[1] = (sense_data[13] << 8) | sense_data[12];



				ioc->eventContext++;

				if (hd->ioc->pcidev->vendor ==

drivers/s390/scsi/zfcp_aux.c

+1 −0
Original line number Diff line number Diff line
@@ -1127,6 +1127,7 @@ zfcp_adapter_dequeue(struct zfcp_adapter *adapter) 
	int retval = 0;

	unsigned long flags;



	zfcp_adapter_scsi_unregister(adapter);

	device_unregister(&adapter->generic_services);

	zfcp_sysfs_adapter_remove_files(&adapter->ccw_device->dev);

	dev_set_drvdata(&adapter->ccw_device->dev, NULL);