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.) -- 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
