From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] avoid kvm-userspace merge conflict with PowerPC KVM support in qemu Date: Wed, 17 Dec 2008 11:49:02 +0200 Message-ID: <4948CB0E.3020204@redhat.com> References: <1229470067.19354.5.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm-devel , kvm-ppc To: Hollis Blanchard Return-path: In-Reply-To: <1229470067.19354.5.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org> Sender: kvm-ppc-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: kvm.vger.kernel.org Hollis Blanchard wrote: > PowerPC KVM support was accepted into upstream qemu. To ease the merge > conflicts, you should apply this patch to remove all traces of PowerPC > KVM code from kvm-userspace before the next qemu pull. > > Applied, thanks. -- error compiling committee.c: too many arguments to function -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html