Hi all,
Today's linux-next merge of the ftrace tree got a conflict in
kernel/module.c between commit 1b75321c2d0561d9ecfe3794fa939264f3eb7e26
("driver core: basic infrastructure for per-module dynamic debug
messages") from the driver-core tree and commit
e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
from the ftrace tree.
Overlapping additions. I fixed it up. Probably worth a look once I
publish the tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpiF2rRosiAc.pgp
Description: PGP signature
