Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/xen/xen-selfballoon.c between commit 38a1ed4f039d ("xen: Fix
selfballooning and ensure it doesn't go too far") from the xen-two tree
and commit 29ff02027c68 ("xen: fix implicit stat.h/module.h include usage
in xen-selfballoon.c") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/xen/xen-selfballoon.c
index d93c708,e21e3ce..0000000
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@@ -68,8 -68,8 +68,10 @@@
*/
#include <linux/kernel.h>
+#include <linux/bootmem.h>
+#include <linux/swap.h>
+ #include <linux/stat.h>
+ #include <linux/module.h>
#include <linux/mm.h>
#include <linux/mman.h>
#include <linux/module.h>
Attachment:
pgpXQXsOtRWnM.pgp
Description: PGP signature
