On Sun, Jul 07, 2013 at 06:45:15PM +0200, Daniel Lezcano wrote: > On 07/07/2013 05:30 PM, Thomas Gleixner wrote: > > On Sun, 7 Jul 2013, Jason Cooper wrote: > >> Sure, but to be clear, Daniel, please drop this patch from your tree. I > >> have no desire to create an out-of-tree dependency if we can avoid it. > >> It has a habit of going horribly wrong [1]. > >> > >> I'll cherry-pick > >> > >> 0c1dcfd clocksource: Add Marvell Orion SoC timer > > > > Don't do that. Do a git fetch on that branch and then git merge > > 0c1dcfd. The patches before that Marvel commit are already in Linus > > tree. That way it does not matter who sends first or not. > > > > We don't force others to drop stuff and cherry picking is a nuisance > > as well as you end up with two different commits doing the same thing. > > > > Also for the next merge window: Can we please let everything under > > drivers/clocksoure go through Daniels and my trees? > > > > I'm starting to be grumpy about anyone thinking that this directory is > > a public dump ground with no rules. > > Yes I agree. I will meet John this week and we will sort out this and > define a clear set of rules to prevent that to happen again.
Oh god no! The rules we have are fine. "Defer to the appropriate maintainer first." Which I did (that's why the patch is in your tree ;-) ). A mistake happened, and we're working together to find the best solution. The last thing we need is more bureaucratic crap. thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
