Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
drivers/oprofile/buffer_sync.c between commit
4c50d9ea9ca9e46b65aeffed3e0d6f54ff38c8d4 ("cpumask: modifiy oprofile
initialization") from the cpus4096 tree and commit
d6d66104b6a06bc0bb541ac59aff59fad46ad466 ("oprofile: Thou shalt not call
__exit functions from __init functions") from the rr tree.
The former just removed the code that the latter was modifying, so I used
the former version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpozin1P9IwD.pgp
Description: PGP signature
