Hi all,
Today's linux-next merge of the kmemcheck tree got a trivial conflict in
mm/slub.c between commit e63352fa06fb8c476e56e51323d80f2e7baee67f
("kmemtrace: SLUB hooks") from the slab tree and commit
18fd427debcf37c06917b55295df682fd05fee76 ("slub: add hooks for
kmemcheck") from the kmemcheck tree.
Just overlapping additions of includes. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc mm/slub.c
index 141a590,5d15933..0000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -23,7 -23,7 +23,8 @@@
#include <linux/kallsyms.h>
#include <linux/memory.h>
#include <linux/math64.h>
+#include <linux/kmemtrace.h>
+ #include <linux/kmemcheck.h>
/*
* Lock order:
--
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
