From: Jason Wang <jasowang@redhat.com>
To: Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL 00/16] Net patches
Date: Mon, 15 Mar 2021 16:07:20 +0800 [thread overview]
Message-ID: <070ebd11-95e7-93ca-0106-f5a4735fbbd3@redhat.com> (raw)
In-Reply-To: <113ed7aa-8999-b925-3df3-2a8d7cd2ad84@redhat.com>
在 2021/3/15 下午1:39, Thomas Huth 写道:
> On 14/03/2021 12.37, Peter Maydell wrote:
>> On Fri, 12 Mar 2021 at 06:16, Jason Wang <jasowang@redhat.com> wrote:
>>>
>>> The following changes since commit
>>> f4abdf32714d1845b7c01ec136dd2b04c2f7db47:
>>>
>>> Merge remote-tracking branch
>>> 'remotes/stsquad/tags/pull-testing-docs-xen-updates-100321-2' into
>>> staging (2021-03-11 16:20:58 +0000)
>>>
>>> are available in the git repository at:
>>>
>>> https://github.com/jasowang/qemu.git tags/net-pull-request
>>>
>>> for you to fetch changes up to
>>> 9bdb56367679e68e5e71a1c29a1087bda6414b25:
>>>
>>> pvrdma: wean code off pvrdma_ring.h kernel header (2021-03-12
>>> 14:08:31 +0800)
>>>
>>> ----------------------------------------------------------------
>>>
>>
>> Hi; this has a merge conflict in net/nic.c relating to
>> ID generation: it looks like
>> "net: unbreak well-form id check for "-nic" (in this pullreq)
>
> Uh, I haven't seen that patch on the list, when did you send it?
My bad, I thought I sent it but it looks not.
>
> Also what about:
>
> https://patchew.org/QEMU/20210303095910.78277-1-lekiravi@yandex-team.ru/
>
> ... that has been on the list since quite a while already and should
> maybe go into v6.0, too?
Yes.
Thanks
>
> Thomas
next prev parent reply other threads:[~2021-03-15 8:10 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 6:16 [PULL 00/16] Net patches Jason Wang
2021-03-12 6:16 ` [PULL 01/16] virtio-net: calculating proper msix vectors on init Jason Wang
2021-03-12 6:16 ` [PULL 02/16] net: Fix build error when DEBUG_NET is on Jason Wang
2021-03-12 6:16 ` [PULL 03/16] net: validate that ids are well formed Jason Wang
2021-03-12 8:44 ` Paolo Bonzini
2021-03-12 13:26 ` Jason Wang
2021-03-12 14:23 ` Paolo Bonzini
2021-03-12 6:16 ` [PULL 04/16] net: unbreak well-form id check for "-nic" Jason Wang
2021-03-12 6:16 ` [PULL 05/16] e1000: fail early for evil descriptor Jason Wang
2021-03-12 6:16 ` [PULL 06/16] net: introduce qemu_receive_packet() Jason Wang
2021-03-12 6:16 ` [PULL 07/16] e1000: switch to use qemu_receive_packet() for loopback Jason Wang
2021-03-12 6:16 ` [PULL 08/16] dp8393x: switch to use qemu_receive_packet() for loopback packet Jason Wang
2021-03-12 6:16 ` [PULL 09/16] msf2-mac: switch to use qemu_receive_packet() for loopback Jason Wang
2021-03-12 6:16 ` [PULL 10/16] sungem: " Jason Wang
2021-03-12 6:16 ` [PULL 11/16] tx_pkt: switch to use qemu_receive_packet_iov() " Jason Wang
2021-03-12 6:16 ` [PULL 12/16] rtl8139: switch to use qemu_receive_packet() " Jason Wang
2021-03-12 6:16 ` [PULL 13/16] pcnet: " Jason Wang
2021-03-12 6:16 ` [PULL 14/16] cadence_gem: " Jason Wang
2021-03-12 6:16 ` [PULL 15/16] lan9118: " Jason Wang
2021-03-12 6:16 ` [PULL 16/16] pvrdma: wean code off pvrdma_ring.h kernel header Jason Wang
2021-03-14 11:37 ` [PULL 00/16] Net patches Peter Maydell
2021-03-15 3:35 ` Jason Wang
2021-03-15 5:39 ` Thomas Huth
2021-03-15 8:07 ` Jason Wang [this message]
2021-03-15 9:52 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=070ebd11-95e7-93ca-0106-f5a4735fbbd3@redhat.com \
--to=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).