diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-05-18 18:13:33 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-05-18 18:13:33 +0200 |
| commit | 16ee6576e25b83806d26eb771138249fcfb5eddc (patch) | |
| tree | 7c717b80f28b5c59ba673dc00f2ca9bd0fc068d4 /tools/virtio | |
| parent | perf tools: Split term type into value type and term type (diff) | |
| parent | tracing: Do not enable function event with enable (diff) | |
| download | linux-16ee6576e25b83806d26eb771138249fcfb5eddc.tar.xz linux-16ee6576e25b83806d26eb771138249fcfb5eddc.zip | |
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 e7c72d8
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>
Diffstat (limited to 'tools/virtio')
0 files changed, 0 insertions, 0 deletions