From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7JU-0001Xj-M8 for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:41:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz7JN-0005rx-7D for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:41:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7JM-0005rq-WF for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:41:41 -0400 Message-ID: <53A85898.6020402@redhat.com> Date: Mon, 23 Jun 2014 18:40:56 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com> <20140623123933.389beb38@redhat.com> In-Reply-To: <20140623123933.389beb38@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 00/43] QMP queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino , peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws Il 23/06/2014 18:39, Luiz Capitulino ha scritto: >> >> I've included a fix from Igor that fixes the most serious conflict from my >> last pull request. Besides, I've fixed some trivial to medium conflicts myself >> and included my two build fixes. Build tested and tested most events again. >> I compared against my own version of the conflict resolution, and the only differences were in code around Igor's new event. So it looks good to me. Paolo