Messages in this thread | | | Date | Fri, 29 Oct 2010 11:42:37 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the xen-pvhvm tree with the xen tree |
| |
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/ [unhandled content-type:application/pgp-signature] | |