Re: [PATCH 0/21] Remove merge artifacts from qemu-kvm

Avi Kivity
2009-04-30T09:50:52Z

Anthony Liguori wrote:
> Now that we've got qemu-kvm, it's pretty easy to look at what's different
> between upstream QEMU and qemu-kvm.

This was actually easy in kvm-userspace.git: git diff origin/master
origin/qemu-svn/trunk.

> Unfortunately, there's still a lot of
> gunk that seems to keep surviving merges.
>
> This series removes all of the gunk I could find. I also culled out a number
> of fixes that should be in upstream QEMU. I'll take care of getting those
> committed.
>

Applied all except patches for which I had objections (noted in separate
replies); thanks.

--
error compiling committee.c: too many arguments to function