Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
kernel/module.c between commit fbf59bc9d74d1fb30b8e0630743aff2806eafcea
("percpu: implement new dynamic percpu allocator") from the tip-core tree
and commit 6649b74fa7cb64421fce4f3cd4c40b3aa6f3208d ("kmemleak: Add
modules support") from the kmemleak tree.
Juts overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/module.c
index 6e7621d,92b60e7..0000000
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -51,7 -51,7 +51,8 @@@
#include <linux/tracepoint.h>
#include <linux/ftrace.h>
#include <linux/async.h>
+#include <linux/percpu.h>
+ #include <linux/kmemleak.h>
#if 0
#define DEBUGP printk
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
