Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
mm/vmalloc.c between commit f0aa6617903648077dffe5cfcf7c4458f4610fa7
("vmalloc: implement vm_area_register_early()") from the tip-core tree
and commit 27e72e01c414e46d39dc87024fa48092d93b77c5 ("kmemleak: Add the
vmalloc memory allocation/freeing hooks") from the kmemleak tree.
Just 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 mm/vmalloc.c
index af58324,40b9040..0000000
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@@ -24,7 -24,7 +24,8 @@@
#include <linux/radix-tree.h>
#include <linux/rcupdate.h>
#include <linux/bootmem.h>
+#include <linux/pfn.h>
+ #include <linux/kmemleak.h>
#include <asm/atomic.h>
#include <asm/uaccess.h>
--
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
