On Sat, 2008-01-19 at 08:59 +0100, Stefan Richter wrote: > Stefan Richter wrote: > > My guess is that there won't be conflicts of this with linux1394-2.6.git > > anytime soon, so taking it into any other tree should be fine. > > Wrong, there should already be a (trivial) conflict due to a patch from > December. Another (trivially) conflicting patch was sent to > linux1394-devel a few hours ago. Both patches will land in Linus' tree > early during the next merge window. So either refresh the patch when > it's time, or give it to me. (Whatever, try not to add to akpm's pain.) Actually, I'm already tracking potential conflicts. The linux1394-2.6.git is part of the merge candidate tree I'm building nightly. These patches will go through the (now slightly misnamed) scsi-bidi-2.6.git tree. That one's built on top of all the currently conflicting trees, and is scheduled to be the last thing merged in the merge window (or at least to wait until the others its built on have gone in). 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
