Re: [libvirt] [PATCH v8 1/4] add new virDomainCoreDumpWithFormat API

On 03/21/2014 01:03 AM, qiaonuohan(a)cn.fujitsu.com wrote: Your From: spelling (qiaonuohan(a)cn.fujitsu.com) does not match your Signed-off-by: spelling (Qiao Nuohan). If 'git am' were to take your email as-is, then 'git shortlog' would show your email instead of your name as the author. You should consider running git config --global user.name "Qiao Nuohan" and/or git config --global sendemail.from \ "Qiao Nuohan <qiaonuohan(a)cn.fujitsu.com&gt; so that in the future, 'git send-email' will make your From: match your S-o-B. On 03/21/2014 08:54 AM, Daniel P. Berrange wrote: Unfortunately, I tried to apply your patches, but 'git am' did not like them: $ git am -3 *API.eml Applying: add new virDomainCoreDumpWithFormat API Using index info to reconstruct a base tree... M include/libvirt/libvirt.h.in M src/driver.h M src/libvirt.c M src/remote/remote_driver.c M src/test/test_driver.c <stdin>:20: trailing whitespace. /** <stdin>:21: trailing whitespace. * virDomainCoreDumpFormat: <stdin>:22: trailing whitespace. * <stdin>:23: trailing whitespace. * Values for specifying different formats of domain core dumps. <stdin>:24: trailing whitespace. */ error: patch failed: include/libvirt/libvirt.h.in:1180 error: include/libvirt/libvirt.h.in: patch does not apply error: patch failed: src/driver.h:306 error: src/driver.h: patch does not apply error: patch failed: src/libvirt.c:2997 error: src/libvirt.c: patch does not apply error: patch failed: src/libvirt_public.syms:645 error: src/libvirt_public.syms: patch does not apply error: patch failed: src/remote/remote_driver.c:7516 error: src/remote/remote_driver.c: patch does not apply error: patch failed: src/remote/remote_protocol.x:904 error: src/remote/remote_protocol.x: patch does not apply error: patch failed: src/remote_protocol-structs:557 error: src/remote_protocol-structs: patch does not apply error: patch failed: src/test/test_driver.c:2427 error: src/test/test_driver.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001 add new virDomainCoreDumpWithFormat API The copy of the patch that failed is found in: /home/eblake/libvirt/.git/rebase-apply/patch Can you please rebase and repost them in a way that is not whitespace munged by your mailer? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org