[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20100508080935.GA5333@lenovo>
Date: Sat, 8 May 2010 12:09:35 +0400
From: Cyrill Gorcunov <gorcunov@...il.com>
To: Ingo Molnar <mingo@...e.hu>
Cc: LKML <linux-kernel@...r.kernel.org>,
Steven Rostedt <rostedt@...dmis.org>,
Peter Zijlstra <peterz@...radead.org>,
Frederic Weisbecker <fweisbec@...il.com>,
Lin Ming <ming.m.lin@...el.com>
Subject: Re: [PATCH -tip] x86,perf: P4 PMU -- protect sensible procedures
from preemption
On Sat, May 08, 2010 at 10:06:40AM +0200, Ingo Molnar wrote:
>
> * Cyrill Gorcunov <gorcunov@...nvz.org> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists