Re: [Qemu-devel] [PULL 0/4] Net patches

[Anthony Liguori]

Stefan Hajnoczi <address@hidden> 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