[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH v3 1/4] rename qemuGetNumadAdvice to virNumaGetAutoPlacementAdvice



On 03/18/2013 03:04 AM, Gao feng wrote:
> qemuGetNumadAdvice will be used by LXC driver,rename

space after comma

> it to virNumaGetAutoPlacementAdvice and move it to virnuma.c
> 
> Signed-off-by: Gao feng <gaofeng cn fujitsu com>
> ---
>  po/POTFILES.in           |  1 +
>  src/Makefile.am          |  1 +
>  src/libvirt_private.syms |  3 +++
>  src/qemu/qemu_process.c  | 34 +++------------------------
>  src/util/virnuma.c       | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
>  src/util/virnuma.h       | 28 ++++++++++++++++++++++
>  6 files changed, 97 insertions(+), 31 deletions(-)
>  create mode 100644 src/util/virnuma.c
>  create mode 100644 src/util/virnuma.h

Wow, I've never seen 'git am' get so confused:

...
A	qemu/qemu_process.c
Falling back to patching base and 3-way merge...
CONFLICT (rename/add): Rename Makefile.am->src/Makefile.am in rename
qemuGetNumadAdvice to virNumaGetAutoPlacementAdvice. src/Makefile.am
added in HEAD
Adding as src/Makefile.am~HEAD instead
Auto-merging src/qemu/qemu_process.c
Auto-merging src/libvirt_private.syms
Auto-merging src/Makefile.am
CONFLICT (content): Merge conflict in src/Makefile.am
...

Thankfully, I was able to straighten it out, and have pushed this patch.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]