* Re: MSM PMU Support in Commit ee3c454b [not found] ` <20100507181543.GC7887@n2100.arm.linux.org.uk> @ 2010-05-07 18:24 ` Daniel Walker 2010-05-07 18:26 ` Russell King - ARM Linux 0 siblings, 1 reply; 5+ messages in thread From: Daniel Walker @ 2010-05-07 18:24 UTC (permalink / raw) To: Russell King - ARM Linux; +Cc: Will Deacon, linux-arm-kernel, linux-arm-msm 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 ? Daniel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: MSM PMU Support in Commit ee3c454b 2010-05-07 18:24 ` MSM PMU Support in Commit ee3c454b Daniel Walker @ 2010-05-07 18:26 ` Russell King - ARM Linux 2010-05-07 18:59 ` Daniel Walker 0 siblings, 1 reply; 5+ messages in thread From: Russell King - ARM Linux @ 2010-05-07 18:26 UTC (permalink / raw) To: Daniel Walker; +Cc: Will Deacon, linux-arm-kernel, linux-arm-msm 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.) ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: MSM PMU Support in Commit ee3c454b 2010-05-07 18:26 ` Russell King - ARM Linux @ 2010-05-07 18:59 ` Daniel Walker 2010-05-07 19:01 ` Russell King - ARM Linux 0 siblings, 1 reply; 5+ messages in thread From: Daniel Walker @ 2010-05-07 18:59 UTC (permalink / raw) To: Russell King - ARM Linux; +Cc: Will Deacon, linux-arm-kernel, linux-arm-msm 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: MSM PMU Support in Commit ee3c454b 2010-05-07 18:59 ` Daniel Walker @ 2010-05-07 19:01 ` Russell King - ARM Linux 2010-05-07 19:20 ` Daniel Walker 0 siblings, 1 reply; 5+ messages in thread From: Russell King - ARM Linux @ 2010-05-07 19:01 UTC (permalink / raw) To: Daniel Walker; +Cc: Will Deacon, linux-arm-kernel, linux-arm-msm On Fri, May 07, 2010 at 11:59:27AM -0700, Daniel Walker wrote: > 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 ? Yup. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: MSM PMU Support in Commit ee3c454b 2010-05-07 19:01 ` Russell King - ARM Linux @ 2010-05-07 19:20 ` Daniel Walker 0 siblings, 0 replies; 5+ messages in thread From: Daniel Walker @ 2010-05-07 19:20 UTC (permalink / raw) To: Russell King - ARM Linux; +Cc: Will Deacon, linux-arm-kernel, linux-arm-msm On Fri, 2010-05-07 at 20:01 +0100, Russell King - ARM Linux wrote: > On Fri, May 07, 2010 at 11:59:27AM -0700, Daniel Walker wrote: > > 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 ? > > Yup. Ok, I updated my for-russell branch with a revert , let me know if that's satisfactory .. Daniel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-05-07 19:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <000101caee07$104acdc0$30e06940$@deacon@arm.com>
[not found] ` <20100507181543.GC7887@n2100.arm.linux.org.uk>
2010-05-07 18:24 ` MSM PMU Support in Commit ee3c454b Daniel Walker
2010-05-07 18:26 ` Russell King - ARM Linux
2010-05-07 18:59 ` Daniel Walker
2010-05-07 19:01 ` Russell King - ARM Linux
2010-05-07 19:20 ` Daniel Walker
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).