From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 0/21] Remove merge artifacts from qemu-kvm Date: Thu, 30 Apr 2009 12:50:49 +0300 Message-ID: <49F97479.3010301@redhat.com> References: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Anthony Liguori Return-path: Received: from mx2.redhat.com ([66.187.237.31]:42133 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114AbZD3Juw (ORCPT ); Thu, 30 Apr 2009 05:50:52 -0400 In-Reply-To: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: 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