From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57753 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGoZO-0005ki-TS for qemu-devel@nongnu.org; Tue, 25 May 2010 03:28:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGoZN-00014B-HT for qemu-devel@nongnu.org; Tue, 25 May 2010 03:28:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34614) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGoZN-00013y-AY for qemu-devel@nongnu.org; Tue, 25 May 2010 03:28:57 -0400 Message-ID: <4BFB7C34.7010805@redhat.com> Date: Tue, 25 May 2010 09:28:52 +0200 From: Paolo Bonzini 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> In-Reply-To: <4BFADED9.3030808@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, lcapitulino@redhat.com 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 > > 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 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 I based my series on top of Luiz's, so it should apply. 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