From: Cyrill Gorcunov <gorcunov@gmail.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: LKML <linux-kernel@vger.kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Peter Zijlstra <peterz@infradead.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Lin Ming <ming.m.lin@intel.com>
Subject: Re: [PATCH -tip] x86,perf: P4 PMU -- protect sensible procedures from preemption
Date: Sat, 8 May 2010 12:09:35 +0400 [thread overview]
Message-ID: <20100508080935.GA5333@lenovo> (raw)
In-Reply-To: <20100508080640.GE2825@elte.hu>
On Sat, May 08, 2010 at 10:06:40AM +0200, Ingo Molnar wrote:
>
> * Cyrill Gorcunov <gorcunov@openvz.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
next prev parent reply other threads:[~2010-05-08 8:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-07 15:05 [PATCH -tip] x86,perf: P4 PMU -- protect sensible procedures from preemption Cyrill Gorcunov
2010-05-08 8:06 ` Ingo Molnar
2010-05-08 8:09 ` Cyrill Gorcunov [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-05 15:07 Cyrill Gorcunov
2010-05-05 16:57 ` Frederic Weisbecker
2010-05-05 17:42 ` Cyrill Gorcunov
2010-05-05 17:58 ` Frederic Weisbecker
2010-05-06 6:44 ` Ingo Molnar
2010-05-06 7:39 ` Cyrill Gorcunov
2010-05-06 7:42 ` Ingo Molnar
2010-05-06 7:45 ` Cyrill Gorcunov
2010-05-06 13:45 ` Steven Rostedt
2010-05-06 14:48 ` Cyrill Gorcunov
2010-05-06 15:26 ` Cyrill Gorcunov
2010-05-06 18:32 ` Steven Rostedt
2010-05-06 18:36 ` Cyrill Gorcunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100508080935.GA5333@lenovo \
--to=gorcunov@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.m.lin@intel.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.