Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
kernel/perf_event.c between commit
0f624e7e5625f4c30c836b7a5decfe2553582391 ("perf_event: Fix incorrect
range check on cpu number") from Linus' tree and commit
40b7c6b7eefc950d625945f773b4c57dcc95b8a4
("cpumask:kernel_perf_event-deprecated-function") from the rr tree.
Overlapping changes. I used the version from Linus' tree (since it was a
bug fix).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp9UHLkhf1QR.pgp
Description: PGP signature
