* linux-next: manual merge of the xen-pvhvm tree with the xen tree
@ 2010-10-29 0:42 Stephen Rothwell
2010-10-29 16:28 ` Stefano Stabellini
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-10-29 0:42 UTC (permalink / raw)
To: Stefano Stabellini
Cc: linux-next, linux-kernel, Juan Quintela, Jeremy Fitzhardinge,
Ian Campbell
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
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 ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the xen-pvhvm tree with the xen tree
2010-10-29 0:42 linux-next: manual merge of the xen-pvhvm tree with the xen tree Stephen Rothwell
@ 2010-10-29 16:28 ` Stefano Stabellini
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Stabellini @ 2010-10-29 16:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Stefano Stabellini, linux-next, linux-kernel, Juan Quintela,
Jeremy Fitzhardinge, Ian Campbell
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-29 16:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-29 0:42 linux-next: manual merge of the xen-pvhvm tree with the xen tree Stephen Rothwell
2010-10-29 16:28 ` Stefano Stabellini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®