From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44757)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Vu08V-00029C-9g
	for qemu-devel@nongnu.org; Fri, 20 Dec 2013 08:29:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Vu08P-0007uo-UX
	for qemu-devel@nongnu.org; Fri, 20 Dec 2013 08:29:03 -0500
Received: from mx1.redhat.com ([209.132.183.28]:37398)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Vu08P-0007uc-M5
	for qemu-devel@nongnu.org; Fri, 20 Dec 2013 08:28:57 -0500
Date: Fri, 20 Dec 2013 08:28:54 -0500
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20131220082854.7a80b31d@redhat.com>
In-Reply-To: <CAEgOgz5Qn1Jxv-2_XmmCwyvFtV9XEC_iZi2e4m9Zra7j9guaxA@mail.gmail.com>
References: <1387386003-8949-1-git-send-email-lcapitulino@redhat.com>
	<CA+aC4kuY=CgYv4nBCoeRwJ_Czn0HFPUEMeNvHu9Cfb6bFZzjnw@mail.gmail.com>
	<CAEgOgz5Qn1Jxv-2_XmmCwyvFtV9XEC_iZi2e4m9Zra7j9guaxA@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PULL 00/13] QMP queue
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel <qemu-devel@nongnu.org>, Anthony Liguori <anthony@codemonkey.ws>, Igor Mammedov <imammedo@redhat.com>

On Fri, 20 Dec 2013 14:00:21 +1000
Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote:

> On Fri, Dec 20, 2013 at 10:49 AM, Anthony Liguori <anthony@codemonkey.ws> wrote:
> > On Wed, Dec 18, 2013 at 8:59 AM, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> >> The following changes since commit e157b8fdd412d48eacfbb8c67d3d58780154faa3:
> >>
> >>   Merge remote-tracking branch 'bonzini/virtio' into staging (2013-12-13 11:10:33 -0800)
> >>
> >> are available in the git repository at:
> >
> > Sorry, you lost the merge conflict to Peter.  Can you please rebase
> > and resubmit?

Sure, no problem.

> Sorry - this one is my fault.

Peter, can you resend your series then?