On Thu, 2008-06-05 at 09:53 -0500, James Bottomley wrote: > On Wed, 2008-05-21 at 15:54 -0500, michaelc@xxxxxxxxxxx wrote: > > From: Mike Christie <michaelc@xxxxxxxxxxx> > > > > This is the second part of the iscsi task merging, and > > all it does it rename iscsi_cmd_task to iscsi_task and > > mtask/ctask to just task. > > OK, I've rebased the scsi-misc tree up to 2.6.26-rc5 (which includes the > rc-fixes tree) and I still can't get this to apply: Actually forget this. A careful recount showed me I'd managed to miss one of the 13 preceding patches. Putting it back into the correct place fixed the rejections. Sorry for the noise, James -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html