From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBVe2-0000Bq-Ol for qemu-devel@nongnu.org; Mon, 19 Aug 2013 16:01:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBVdw-0000B0-Mr for qemu-devel@nongnu.org; Mon, 19 Aug 2013 16:01:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBVdw-0000Av-GC for qemu-devel@nongnu.org; Mon, 19 Aug 2013 16:01:36 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7JK1ZZG009296 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 19 Aug 2013 16:01:35 -0400 Message-ID: <52127A34.3010201@redhat.com> Date: Mon, 19 Aug 2013 22:04:04 +0200 From: Laszlo Ersek MIME-Version: 1.0 References: <1374527256-27631-1-git-send-email-lersek@redhat.com> <1374527256-27631-9-git-send-email-lersek@redhat.com> <20130819152622.63c9b86a@redhat.com> <52127817.2040508@redhat.com> In-Reply-To: <52127817.2040508@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 8/8] OptsVisitor: introduce unit tests, with test cases for range flattening List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org On 08/19/13 21:55, Laszlo Ersek wrote: > On 08/19/13 21:26, Luiz Capitulino wrote: >> On Mon, 22 Jul 2013 23:07:36 +0200 >> Laszlo Ersek wrote: >> >>> >>> Signed-off-by: Laszlo Ersek >> >> This patch now conflicts, can you respin please? > > Can you retry with "git am -3"? > > "git rebase -i" didn't ask me to do anything manually, so I'm guessing > if you let "git am" to do a 3-way merge, it should work. > > (Of course I don't have anything against posting a v2, this is just an > attempt to keep the traffic low.) ... yeah it looks like: - a trivial context change in "tests/Makefile" (due to commit 3464700f), - "qapi-schema-test.json" has been renamed to "tests/qapi-schema/qapi-schema-test.json" (commit 4f193e34): diff --git a/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json similarity index 100% rename from qapi-schema-test.json rename to tests/qapi-schema/qapi-schema-test.json These should be no problem for "git am -3". Thanks, Laszlo