lkml.org 
[lkml]   [2010]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the xen-pvhvm tree with the xen tree
On Fri, 29 Oct 2010, Stephen Rothwell wrote:
> Hi Stefano,
>
> Today's linux-next merge of the xen-pvhvm tree got a conflict in
> arch/x86/xen/setup.c between commit
> a1857ddc9ba2dfdbfd70171181e481f2f64b8d0b ("xen: do not release any memory
> under 1M in domain 0") from the xen tree and commit
> 4ec5387cc36c6472a2ff2c82e9865abe8cab96c2 ("xen: add the direct mapping
> area for ISA bus access") from the xen-pvhvm tree.
>
> Just differences in a comment. I just used the version from the xen
> tree ...

I think is fine


\
 
 \ /
  Last update: 2010-10-29 19:53    [W:0.041 / U:1.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site