[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] Re: linux-next: manual merge of the xen tree with the tip tree
On 10/21/2010 08:36 PM, Stephen Rothwell wrote: > Hi Jeremy, > > On Fri, 22 Oct 2010 14:03:35 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > wrote: >> >> 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. > x86-32, memblock: Make add_highpages honor early reserved ranges is updated version with memblock for x86/32: honor reservations of high memory Assume Jeremy would update the xen tree. Thanks Yinghai _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |