Hi Will,
Today's linux-next merge of the arm-perf tree got a conflict in arch/arm/kernel/perf_event_cpu.c between commit 338d9dd3e2ae ("ARM:
8351/1: perf: don't warn about missing interrupt-affinity property for
PPIs") (and others) from Linus' tree and commit 74cf0bc75f16 ("arm:
perf: unify perf_event{,_cpu}.c") from the arm-perf tree.
I fixed it up (the changes from Linus' tree have been included in the
arm-perf tree change, so I just removed the file) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpOd89j3cvNu.pgp
Description: OpenPGP digital signature
