]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 787926b 7b66665)
Merge by hand (conflicts in scsi_lib.c)
authorJames Bottomley <jejb@titanic.(none)>
Thu, 15 Dec 2005 23:35:24 +0000 (17:35 -0600)
committerJames Bottomley <jejb@titanic.(none)>
Thu, 15 Dec 2005 23:35:24 +0000 (17:35 -0600)
commit2a1e1379bae53f647c463a677cc2ec71b591c348
treea152beb5e8679e94430c5b47bf798dd8a2d4fd5dtree | snapshot
parent787926b1b2d21d42ca462dc736b77f1a4a30c503commit | diff
parent7b6666530e2736f190a2629c8abe34275054449fcommit | diff
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>
drivers/scsi/iscsi_tcp.c diff1 | diff2 | blob | history
drivers/scsi/megaraid.c diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_def.h diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_init.c diff1 | diff2 | blob | history
drivers/scsi/scsi_error.c diff1 | diff2 | blob | history
drivers/scsi/sd.c diff1 | diff2 | blob | history
drivers/scsi/sr.c diff1 | diff2 | blob | history
drivers/scsi/st.c diff1 | diff2 | blob | history
drivers/scsi/sym53c8xx_2/sym_hipd.c diff1 | diff2 | blob | history
include/linux/pci_ids.h diff1 | diff2 | blob | history
Linux 2.6 source tree