Hi all,
Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/ring_buffer.c between commit
4f5a7f40ddbae98569acbb99118a98570315579c ("ftrace: prevent recursion")
from Linus' tree and commit 182e9f5f704ed6b9175142fe8da33c9ce0c52b52
("ftrace: insert in the ftrace_preempt_disable()/enable() functions")
from the ftrace tree.
I am pretty sure that the latter supercedes the former, so I used that
version. Please fix this conflict up in the ftrace tree soon.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpnyY0q0WamO.pgp
Description: PGP signature
