lkml.org 
[lkml]   [2010]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [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@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


    \
     
     \ /
      Last update: 2010-05-08 10:13    [W:3.122 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site