On Fri, 2010-05-07 at 19:26 +0100, Russell King - ARM Linux wrote: > On Fri, May 07, 2010 at 11:24:07AM -0700, Daniel Walker wrote: > > On Fri, 2010-05-07 at 19:15 +0100, Russell King - ARM Linux wrote: > > > Maybe I'll just keep the devel-stable branch entirely separate until > > > the devel stuff has been merged, and then MSM can be sorted at some > > > point later. This unfortunately means that devel-stable drops out of > > > linux-next. It also means that linux-next is at risk of missing the > > > merge window... again. > > > > Would it matter if you just did a revert on the MSM pmu patch ? > > No - and it might be better if you did it. I could do it on my > devel-stable branch but then that'll cause you problems if you > apply a patch from Will for this (but I think you'll have problems > with that whichever way.) I'll add a revert on my for-russell branch, then you can pull that. Is that what your thinking ? Daniel -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
