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@xxxxxxxxxxxxxxxx
Attachment:
pgp15Su7Uqn7u.pgp
Description: PGP signature
