Re: [PATCH -tip] x86,perf: P4 PMU -- protect sensible proceduresfrom preemption

[Cyrill Gorcunov]

On Sat, May 08, 2010 at 10:06:40AM +0200, Ingo Molnar wrote:
> 
> * Cyrill Gorcunov <gorcunov@xxxxxxxxxx> wrote:
> 
> >  arch/x86/kernel/cpu/perf_event_p4.c |    8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> Looks good - but it doesnt apply cleanly to tip:master:
> 
>  Hunk #3 succeeded at 828 with fuzz 2 (offset 373 lines).
>  Hunk #4 FAILED at 743.
>  1 out of 4 hunks FAILED -- rejects in file arch/x86/kernel/cpu/perf_event_p4.c
> 
> is there some other patch dependency?
> 
> Thanks,
> 
> 	Ingo
> 

No, no deps, I think it's merging clash. Will update it shortly.

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