From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@redhat.com>
Subject: Re: [GIT PULL] Merge latest qemu.git
Date: Thu, 11 Jun 2009 15:29:39 +0300
Message-ID: <4A30F8B3.70104@redhat.com>
References: <1244717573.7752.9.camel@blaa>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: kvm <kvm@vger.kernel.org>
To: Mark McLoughlin <markmc@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:58466 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751748AbZFKM3i (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 11 Jun 2009 08:29:38 -0400
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26])
	by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5BCTf8l031518
	for <kvm@vger.kernel.org>; Thu, 11 Jun 2009 08:29:41 -0400
In-Reply-To: <1244717573.7752.9.camel@blaa>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Mark McLoughlin wrote:
> Hi Avi,
> 	The conflicts with the networking changes just pushed to qemu.git are
> fairly involved to resolve, so I thought I'd try and save you the pain.
>
> 	Below is a pull request which merges in the latest, and does it in the
> way we recently discussed - each conflict is resolved in a separate
> merge commit.
>
> 	I've build tested the x86_64-softmmu target and done some light
> networking testing.
>
>   

Pulled, thanks.

> HTH,
>   

Very much.

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