[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] linux-next: manual merge of the xen tree with Linus' tree
Hi all, Today's linux-next merge of the xen tree got a conflict in arch/x86/xen/mmu.c between commit fef5ba797991f9335bcfc295942b684f9bf613a1 ("xen: Cope with unmapped pages when initializing kernel pagetable") from Linus' tree and commit 41f2e4771a4f1ba26c35438daf32917b9ef7858d ("xen: add support for PAT") from the xen tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/x86/xen/mmu.c index f72d18c,6ba8f8a..0000000 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@@ -56,7 -55,7 +56,8 @@@ #include <asm/e820.h> #include <asm/linkage.h> #include <asm/page.h> +#include <asm/init.h> + #include <asm/pat.h> #include <asm/xen/hypercall.h> #include <asm/xen/hypervisor.h> _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |