James Bottomley wrote: > Actually, I'm already tracking potential conflicts. The > linux1394-2.6.git is part of the merge candidate tree I'm building > nightly. Right, I saw your announcement of this tree. > 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). Good, everything should come together nicely then. -- Stefan Richter -=====-==--- ---= =--== http://arcgraph.de/sr/ - 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
