From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from caramon.arm.linux.org.uk ([78.32.30.218]:52969 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753101Ab0EGTCH (ORCPT ); Fri, 7 May 2010 15:02:07 -0400 Date: Fri, 7 May 2010 20:01:48 +0100 From: Russell King - ARM Linux Subject: Re: MSM PMU Support in Commit ee3c454b Message-ID: <20100507190148.GF7887@n2100.arm.linux.org.uk> References: <000101caee07$104acdc0$30e06940$@deacon@arm.com> <20100507181543.GC7887@n2100.arm.linux.org.uk> <1273256647.3542.45.camel@c-dwalke-linux.qualcomm.com> <20100507182637.GE7887@n2100.arm.linux.org.uk> <1273258767.3542.80.camel@c-dwalke-linux.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1273258767.3542.80.camel@c-dwalke-linux.qualcomm.com> Sender: linux-arm-msm-owner@vger.kernel.org List-ID: To: Daniel Walker Cc: Will Deacon , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org 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.