Date: Thu, 30 Apr 2009 08:58:56 +0200
From: Ingo Molnar <mingo@elte.hu>
To: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
       Robert Richter <robert.richter@amd.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf_counter: powerpc: allow use of limited-function
	counters
Message-ID: <20090430065856.GA16737@elte.hu>
References: <18936.19035.163066.892208@cargo.ozlabs.ibm.com> <20090429130915.GA23563@elte.hu> <18936.56613.479043.380867@cargo.ozlabs.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <18936.56613.479043.380867@cargo.ozlabs.ibm.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1078
Lines: 30


* Paul Mackerras <paulus@samba.org> wrote:

> Ingo Molnar wrote:
> 
> > [ Note, i saw some fuzz in those files. It applied fine but maybe 
> >   you have some local changes in them that are not in 
> >   tip:perfcounters/core yet? You might want to double check that. ]
> 
> I think it was just Robert Richter's changes that caused the fuzz. 
> The end result seems to be OK.

ah, indeed - the rename:

  4aeb0b4: perfcounters: rename struct hw_perf_counter_ops into struct pmu

changed context lines in your patch causing the fuzz. The mechanic 
rename changed quite a bit of stuff in the powerpc driver - we were 
lucky that your rather large patch still merged cleanly.

Btw, if in the future such renames cause problems for any pending 
patch of yours we can always pick up your patches first and then 
re-do the rename.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/