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: firefly_0821_release~38905^2~16^2~33^2~10 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2a1e1379bae53f647c463a677cc2ec71b591c348;p=firefly-linux-kernel-4.4.55.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