Messages in this thread | | | Date | Wed, 21 Mar 2012 16:31:51 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the oprofile tree with the tip tree |
| |
Hi Robert,
Today's linux-next merge of the oprofile tree got a conflict in tools/perf/util/parse-events.c between commit 89812fc81f8d ("perf tools: Add parser generator for events parsing") from the tip tree and commit 1e48600d2388 ("perf tool: Parse general/raw events from sysfs") from the oprofile tree.
I have no idea how to fix this up, so I effectively dropped this patch from the oprofile tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |