James Bottomley 2a1e1379ba Merge by hand (conflicts in scsi_lib.c) ...

This merge is pretty extensive.  The conflict is over the new
req->retries parameter, so I had to change the prototype to
scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2005-12-15 17:35:24 -06:00

..

iscsi_if.h

[SCSI] open-iscsi/linux-iscsi-5 Initiator: Header files

2005-08-06 09:33:41 -05:00

iscsi_proto.h

[SCSI] iscsi: rename some proto defs

2005-09-20 12:35:27 -05:00

scsi_cmnd.h

[SCSI] Consolidate REQ_BLOCK_PC handling path (fix ipod panic)

2005-12-13 21:29:27 -08:00

scsi_dbg.h

[SCSI] convert sd to scsi_execute_req (and update the scsi_execute_req API)

2005-08-28 11:33:52 -05:00

scsi_device.h

[SCSI] Convert SCSI mid-layer to scsi_execute_async

2005-12-14 19:03:35 -08:00

scsi_devinfo.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

scsi_driver.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

scsi_eh.h

Merge by hand (conflicts in sd.c)

2005-09-06 17:52:54 -05:00

scsi_host.h

[SCSI] use a completion in scsi_send_eh_cmnd

2005-11-06 12:49:36 -06:00

scsi_ioctl.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

scsi_request.h

[SCSI] remove scsi_wait_req

2005-11-06 12:45:20 -06:00

scsi_tcq.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

scsi_transport_fc.h

Merge by Hand

2005-11-04 22:29:52 -06:00

scsi_transport_iscsi.h

[SCSI] open-iscsi/linux-iscsi-5 Initiator: Header files

2005-08-06 09:33:41 -05:00

scsi_transport_sas.h

[SCSI] sas: add support for PHY resets

2005-10-28 19:08:03 -05:00

scsi_transport_spi.h

[SCSI] Make scsi_transport_spi.h includable by itself

2005-12-13 18:54:40 -07:00

scsi_transport.h

[SCSI] fix target scanning oops with fc transport class

2005-08-08 17:14:55 -05:00

scsi.h

Merge /spare/repo/linux-2.6/

2005-08-10 13:46:28 -04:00

scsicam.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sg_request.h

[PATCH] I2O: Adaptec specific SG_IO access, firmware access through sysfs and 2400A workaround

2005-06-24 00:05:28 -07:00

sg.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

srp.h

IB: Add SCSI RDMA Protocol (SRP) initiator

2005-11-02 14:07:13 -08:00