From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39040)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1VHeRs-00042W-Fu
	for qemu-devel@nongnu.org; Thu, 05 Sep 2013 14:38:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1VHeRm-0007Rf-Mj
	for qemu-devel@nongnu.org; Thu, 05 Sep 2013 14:38:32 -0400
Received: from mail-oa0-f52.google.com ([209.85.219.52]:57989)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1VHeRm-0007RV-Hr
	for qemu-devel@nongnu.org; Thu, 05 Sep 2013 14:38:26 -0400
Received: by mail-oa0-f52.google.com with SMTP id f4so2699801oah.25
	for <qemu-devel@nongnu.org>; Thu, 05 Sep 2013 11:38:26 -0700 (PDT)
From: Anthony Liguori <anthony@codemonkey.ws>
In-Reply-To: <1378121913-30494-1-git-send-email-stefanha@redhat.com>
References: <1378121913-30494-1-git-send-email-stefanha@redhat.com>
Date: Thu, 05 Sep 2013 13:38:23 -0500
Message-ID: <8738pjjeqo.fsf@codemonkey.ws>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Re: [Qemu-devel] [PULL 0/4] Net patches
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: Stefan Hajnoczi <stefanha@redhat.com>, qemu-devel@nongnu.org

Stefan Hajnoczi <stefanha@redhat.com> writes:

> The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
>
>   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
>
> are available in the git repository at:

Sorry, I forgot to send you this feedback earlier.

This conflicts badly with a pull request from Michael Tsirkin that I
merged already.  Can you rebase against master and resubmit?

Thanks!

Regards,

Anthony Liguori

>
>
>   git://github.com/stefanha/qemu.git net
>
> for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:
>
>   vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)
>
> ----------------------------------------------------------------
> Brad Smith (2):
>       tap: Use numbered tap/tun devices on all *BSD OS's
>       vmxnet3: Eliminate __packed redefined warning
>
> Jan Kiszka (1):
>       net: Rename send_queue to incoming_queue
>
> Vincenzo Maffione (1):
>       e1000: add interrupt mitigation support
>
>  hw/i386/pc_piix.c    |  18 ++++++-
>  hw/i386/pc_q35.c     |  16 ++++++-
>  hw/net/e1000.c       | 131 +++++++++++++++++++++++++++++++++++++++++++++++++--
>  hw/net/vmxnet3.h     |   2 -
>  include/hw/i386/pc.h |   8 ++++
>  include/net/net.h    |   2 +-
>  net/hub.c            |   2 +-
>  net/net.c            |  14 +++---
>  net/tap-bsd.c        |  11 -----
>  9 files changed, 176 insertions(+), 28 deletions(-)
>
> -- 
> 1.8.3.1