From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=47055 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OGtrm-0003mY-ER
	for qemu-devel@nongnu.org; Tue, 25 May 2010 09:08:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <aliguori@linux.vnet.ibm.com>) id 1OGtri-0004po-2k
	for qemu-devel@nongnu.org; Tue, 25 May 2010 09:08:18 -0400
Received: from e6.ny.us.ibm.com ([32.97.182.146]:49969)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aliguori@linux.vnet.ibm.com>) id 1OGtrh-0004pc-Vj
	for qemu-devel@nongnu.org; Tue, 25 May 2010 09:08:14 -0400
Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233])
	by e6.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id o4PD6P3j018004
	for <qemu-devel@nongnu.org>; Tue, 25 May 2010 09:06:25 -0400
Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85])
	by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id
	o4PD8C1q062826
	for <qemu-devel@nongnu.org>; Tue, 25 May 2010 09:08:12 -0400
Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1])
	by d03av05.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP
	id o4PD8BnX020450
	for <qemu-devel@nongnu.org>; Tue, 25 May 2010 07:08:11 -0600
Message-ID: <4BFBCBB9.3060107@linux.vnet.ibm.com>
Date: Tue, 25 May 2010 08:08:09 -0500
From: Anthony Liguori <aliguori@linux.vnet.ibm.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH v2 1/3] add some tests for invalid JSON
References: <1274686793-1566-1-git-send-email-pbonzini@redhat.com>
	<1274686793-1566-2-git-send-email-pbonzini@redhat.com>
	<4BFADED9.3030808@linux.vnet.ibm.com> <4BFB7C34.7010805@redhat.com>
In-Reply-To: <4BFB7C34.7010805@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, lcapitulino@redhat.com

On 05/25/2010 02:28 AM, Paolo Bonzini wrote:
> On 05/24/2010 10:17 PM, Anthony Liguori wrote:
>> On 05/24/2010 02:39 AM, Paolo Bonzini wrote:
>>> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
>>
>> I think this series conflicts a bit with Luiz's series which I just
>> pushed. Could you rebase against the latest?
>
> You didn't apply this one yet, at least I don't see it on qemu.git
>
> commit e546343ee0f3f904529d32c1a9a60f5baa181852
> Author: Luiz Capitulino <lcapitulino@redhat.com>
> Date:   Wed May 19 18:15:32 2010 -0300
>
>     json-lexer: Drop 'buf'
>
>     QString supports adding a single char, 'buf' is unneeded.
>
>     Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
>
> I based my series on top of Luiz's, so it should apply.

Yeah, I confused myself into thinking that Luiz's series was more 
contentious than it is.  Nevermind, your patches are fine on top of his.

Regards,

Anthony Liguori

> The above is the only commit that is actually required.  I can ping 
> the series once Luiz's patches are applied, so you can disregard it in 
> the meanwhile.
>
> Paolo