| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
[Xen-devel] linux-next: manual merge of the xen tree with the tip tree
|
To: |
Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx> |
|
Subject: |
[Xen-devel] linux-next: manual merge of the xen tree with the tip tree |
|
From: |
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|
Date: |
Fri, 22 Oct 2010 14:03:35 +1100 |
|
Cc: |
Thomas, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, "H. Peter Anvin" <hpa@xxxxxxxxx>, Gleixner <tglx@xxxxxxxxxxxxx>, Yinghai Lu <yinghai@xxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>, Gianluca Guida <gianluca.guida@xxxxxxxxxx> |
|
Delivery-date: |
Thu, 21 Oct 2010 20:04:36 -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/mm/init_32.c between commit
1d931264af0f10649b35afa8fbd2e169da51ac08 ("x86-32, memblock: Make
add_highpages honor early reserved ranges") from the tip tree and commit
07147a06ac3b1b028124ea00ba44e69eb8ea7685 ("x86/32: honor reservations of
high memory") from the xen tree.
I have no idea how to fix this up, sorry, so I have used the xen tree
from next-20101021 for today.
There were also conflicts in:
arch/x86/xen/mmu.c
include/linux/early_res.h
kernel/early_res.c
These last two were deleted in the tip tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
pgp2hiJ1fhgy1.pgp
Description: PGP signature
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
| <Prev in Thread] |
Current Thread |
[Next in Thread>
|
- [Xen-devel] linux-next: manual merge of the xen tree with the tip tree,
Stephen Rothwell <=
|
|
|
| |
|
Home