Re: [PATCH 00/15] oprofile fixes and updates for v2.6.34

[Robert Richter]

On 27.02.10 10:03:31, Ingo Molnar wrote:
> Hm, the perf_event.c bits conflict quite heavily with pending changes in 
> tip:perf/core.
> 
> So to not hold up the oprofile changes for v2.6.34 i've pulled the core 
> oprofile changes for v2.6.34 into tip:oprofile (up to cfc9c0b, if that is fine 
> with you), and mind reworking the last 3 patches against perf/core?

Ingo & Peter,

I have a rebased version containing also a merge from:

 tip/oprofile -> tip/perf/core

Please pull again from:

 git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git core

> 
> On a related note, wrt. your ongoing work for perf IBS support. The following 
> patch by Peter:
> 
>   f22f54f: perf_events, x86: Split PMU definitions into separate files

Yes, the patches went also upstream on Friday. Will update my current
patch stack now. Maybe it would have been better to first integrate
all pending patches before doing that split. Conflict resolution is a
pain for moving code. But anyway, it is supposed to go upstream and I
will rebase my patches.

> 
> Will probably interact with those patches.
> 
> As usual you can avoid such interactions and conflicts by pushing any pending 
> bits to Peter and me earlier. It can even be disabled temporarily (if that can 
> be done cleanly), if IBS support is not fully working yet.

Hmm, I was working with latest tip/perf/core, but I was waiting with
my submission for Peter's quilt queue since I know there were
conflicts again.

I will start submitting patches now relative to latest
tip/perf/core. There shouldn't be more patches flying around.

I decided to send the perf_event.h changes via the oprofile tree since
tip/perf/core was not stable enough. The patches contain cross
subsystem changes and are not only for perf. Perf-only patches I wont
send upstream via oprofile.

-Robert

-- 
Advanced Micro Devices, Inc.
Operating System Research Center
email: robert.richter@xxxxxxx

--
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/