Re: linux-next: manual merge of the moduleh tree with the xen-two tree
From: Paul Gortmaker <hidden>
Date: 2011-10-26 19:30:51
Also in:
lkml
[linux-next: manual merge of the moduleh tree with the xen-two tree] On 25/10/2011 (Tue 19:34) Stephen Rothwell wrote:
quoted hunk ↗ jump to hunk
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@canb.auug.org.au 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>
Thanks, Stephen. I'll just drop the module.h commit, since there is clearly two module.h listings above, as 4fec0e0bde09095b6349dc6206dbf19cebcd0a7e from v3.1-rc3 and forward added the last line above. The stat.h addition, while correct, isn't critical, since module.h has to include stat.h Paul.