Messages in this thread | | | Date | Thu, 1 Nov 2012 14:41:14 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tmem tree with the xen-two tree |
| |
Hi Konrad,
Today's linux-next merge of the tmem tree got a conflict in arch/x86/xen/setup.c between commit 6056726e851a ("xen/pvh: bootup and setup (E820) related changes") from the xen-two tree and commit 7282a68f5aea ("PVH: Basic and preparatory changes") from the tmem tree.
I fixed it up (by using the xen-two tree version) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |