Hi all,
Today's linux-next merge of the timers tree got a conflict in
arch/x86/oprofile/nmi_int.c between commit
accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 ("Merge branch 'linus' into
oprofile-v2") from Linus' tree and commit
1a960b402a51d80abf54e3f8e4972374ffe5f22d ("Oprofile Multiplexing Patch")
from the timers tree.
Also, it looks like commit 0329693bf72584efd84dde19997ee4f0c54f8d57
("Merge branch 'linus' into irq/sparseirq") in the timers tree is a bad
merge and causes anothe conflict with Linus' tree.
I fixed them up using the obvious bits of each.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpWZqutIdGI0.pgp
Description: PGP signature
