From: James Bottomley Date: Thu, 15 Dec 2005 23:35:24 +0000 (-0600) Subject: Merge by hand (conflicts in scsi_lib.c) X-Git-Tag: v2.6.16-rc1~474^2~22^2~8^2~10 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2a1e1379bae53f647c463a677cc2ec71b591c348;p=~emulex%2Finfiniband.git 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 --- 2a1e1379bae53f647c463a677cc2ec71b591c348