Hi Ingo,
Today's linux-next merge of the oprofile tree got a conflict in
arch/x86/oprofile/nmi_int.c between commit
0329693bf72584efd84dde19997ee4f0c54f8d57 ("Merge branch 'linus' into
irq/sparseirq") from the timers tree and commit
424bf62df64003f35ce8941494dcfe7ab61376b3 ("manual merge of oprofile")
from the oprofile tree.
The former merge added two declarations twice. I just removed the extras.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpQKLb6GhMz5.pgp
Description: PGP signature
