On Tue, 14 Dec 2010, Cousson, Benoit wrote: > This patch will conflict with your power prcm series, because you are creating > an empty scrm44xx.h in it. > > So I did rebased this series on top on your prcm to fix that. > > Don't you want to use the already rebased version instead? I would rather have patches and branches based on mainline commits where possible. If a series has some explicit dependency on a non-mainline patch or branch then I'd like to know about it in the messages if possible. As far as the empty scrm44xx.h goes, I will probably go back and rebuild that branch with your patch that creates SCRM from my patch set inserted earlier, so I can drop the part of my patch that creates the empty file. - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
