Hi all,
Today's linux-next merge of the uml tree got a conflict in:
arch/um/include/shared/um_malloc.h
between commit:
88ae5fb755b0 ("mm: vmalloc: enable memory allocation profiling")
from the mm-unstable branch of the mm tree and commit:
0c2b208c8b79 ("um: Fix the declaration of vfree")
from the uml tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/um/include/shared/um_malloc.h
index bf503658f08e,d25084447c69..000000000000
--- a/arch/um/include/shared/um_malloc.h
+++ b/arch/um/include/shared/um_malloc.h
@@@ -11,9 -11,8 +11,9 @@@
extern void *uml_kmalloc(int size, int flags);
extern void kfree(const void *ptr);
-extern void *vmalloc(unsigned long size);
+extern void *vmalloc_noprof(unsigned long size);
+#define vmalloc(...) vmalloc_noprof(__VA_ARGS__)
- extern void vfree(void *ptr);
+ extern void vfree(const void *ptr);
#endif /* __UM_MALLOC_H__ */
Attachment:
pgp6VCqc16Gak.pgp
Description: OpenPGP digital signature
