On 02/21/2011 11:01 AM, Eric Blake wrote: > On 02/21/2011 06:40 AM, Markus Groà wrote: >> --- >> src/xen/xend_internal.c | 876 --------------------------------------------- >> src/xen/xend_internal.h | 12 - >> src/xenxs/xen_sxpr.c | 850 +++++++++++++++++++++++++++++++++++++++++++- >> src/xenxs/xen_sxpr.h | 32 ++ >> src/xenxs/xenxs_private.h | 18 + >> tests/xml2sexprtest.c | 1 + >> 6 files changed, 900 insertions(+), 889 deletions(-) > > $ git am -3 ../xenxs.eml > Applying: Moved SEXPR formatting functions to xenxs > fatal: sha1 information is lacking or useless (src/xen/xend_internal.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 Moved SEXPR formatting functions to xenxs > > > Would you mind rebasing and fixing this? 1-3 and 8 are in, but 4-7 > could use some more attention. Never mind - I figured it out. My squashed change for keeping cppi happy in patch 3 caused one of the conflicts, and my global DEBUG->VIR_DEBUG patch pushed earlier today caused the other. I've gone ahead and pushed 4-7 with the trivial conflict resolutions, but you may want to double-check things. Thanks again for tackling this patch series! -- Eric Blake eblake@xxxxxxxxxx +1-801-349-2682 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list