Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
mm/slub.c between commit 773ff60e841461cb1f9374a713ffcda029b8c317 ("SLUB:
failslab support") from the slab tree and commit
18fd427debcf37c06917b55295df682fd05fee76 ("slub: add hooks for
kmemcheck") from the kmemcheck tree.
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 mm/slub.c
index f0e2892,df12f28..0000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -24,7 -24,7 +24,8 @@@
#include <linux/kallsyms.h>
#include <linux/memory.h>
#include <linux/math64.h>
+#include <linux/fault-inject.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
