| Date | Sat, 8 Dec 2012 15:27:22 +0100 | From | Ingo Molnar <> | Subject | Re: [GIT PULL 00/32] perf/core improvements and fixes |
| |
Note that I had to do a number of conflict resolutions between perf/urgent (now upstream) and perf/core, related to UAPI fixes:
commit f0b9abfb044649bc452fb2fb975ff2fd599cc6a3 Merge: adc1ef1 1b3c393 Author: Ingo Molnar <mingo@kernel.org> Date: Sat Dec 8 15:25:06 2012 +0100
Merge branch 'linus' into perf/core
Conflicts: tools/perf/Makefile tools/perf/builtin-test.c tools/perf/perf.h tools/perf/tests/parse-events.c tools/perf/util/evsel.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
I think I managed to resolve them all correctly - but please double check the end result nevertheless.
Thanks,
Ingo
|