From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58059 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pxvus-00085C-75 for qemu-devel@nongnu.org; Fri, 11 Mar 2011 01:33:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pxvur-0002g4-2z for qemu-devel@nongnu.org; Fri, 11 Mar 2011 01:33:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pxvuq-0002g0-Ja for qemu-devel@nongnu.org; Fri, 11 Mar 2011 01:33:37 -0500 Message-ID: <4D79C22D.7030802@redhat.com> Date: Fri, 11 Mar 2011 07:33:17 +0100 From: Jes Sorensen MIME-Version: 1.0 References: <1299686074-25719-1-git-send-email-Jes.Sorensen@redhat.com> <4D795CFD.8050707@codemonkey.ws> In-Reply-To: <4D795CFD.8050707@codemonkey.ws> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH] hmp-commands.hx: fix badly merged client_migrate_info command 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 03/11/11 00:21, Anthony Liguori wrote: > On 03/09/2011 09:54 AM, Jes.Sorensen@redhat.com wrote: >> From: Jes Sorensen >> >> client_migrate_info was merged badly, > > It wasn't merged badly, it was implemented badly. The initial > description confused me because it sounded like a bad merge conflict > resolution but it just was wrong from the start. I wasn't quite sure where the badness happened, it basically looked like a bad cleanup after a git pull. Sorry if I gave the impression that the merge at your end was to blame. Cheers, Jes