]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 18 May 2012 16:13:33 +0000 (13:13 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 18 May 2012 16:13:33 +0000 (13:13 -0300)
commit489d03ee236526644d0a755f75ef8cdafbe5991b
tree7c717b80f28b5c59ba673dc00f2ca9bd0fc068d4
parent257a2368ae41a95bf8bc261a2f7e2a368123ff8e
parent821958bab1b84148be4a1e90183ddb5b6543cc06
Merge remote-tracking branch 'tip/perf/urgent' into perf/core

Merge reason: We are going to queue up a dependent patch:

"perf tools: Move parse event automated tests to separated object"

That depends on:

commit 1bda3f4
perf tools: Add 'G' and 'H' modifiers to event parsing

Conflicts:
tools/perf/builtin-stat.c

Conflicted with the recent 'perf_target' patches when checking the
result of perf_evsel open routines to see if a retry is needed to cope
with older kernels where the exclude guest/host perf_event_attr bits
were not used.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Makefile
kernel/events/core.c
kernel/sched/core.c
kernel/trace/trace.c
kernel/trace/trace.h
tools/perf/Makefile
tools/perf/builtin-report.c
tools/perf/builtin-stat.c
tools/perf/builtin-test.c
tools/perf/util/header.c