 Home |
Products |
Support |
Community |
News |
xen-devel
[Xen-devel] linux-next: manual merge of the xen tree with Linus' tree
| To: | Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | [Xen-devel] linux-next: manual merge of the xen tree with Linus' tree |
| From: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
| Date: | Wed, 27 Oct 2010 12:00:54 +1100 |
| Cc: | linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx |
| Delivery-date: | Tue, 26 Oct 2010 18:01:55 -0700 |
| Envelope-to: | www-data@xxxxxxxxxxxxxxxxxxx |
| List-help: | <mailto:xen-devel-request@lists.xensource.com?subject=help> |
| List-id: | Xen developer discussion <xen-devel.lists.xensource.com> |
| List-post: | <mailto:xen-devel@lists.xensource.com> |
| List-subscribe: | <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> |
| List-unsubscribe: | <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> |
| Sender: | xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
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
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [Xen-devel] State of nested VMX, domiel forty-two |
|---|---|
| Next by Date: | [Xen-devel] linux-next: build failure after merge of the xen tree, Stephen Rothwell |
| Previous by Thread: | [Xen-devel] State of nested VMX, domiel forty-two |
| Next by Thread: | [Xen-devel] [Patch 0/4] Refining Xsave/Xrestore support, Haitao Shan |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
