| Message ID | 1615529786-30763-1-git-send-email-jasowang@redhat.com |
|---|---|
| State | New |
| Headers | show |
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) "net: Use id_generate() in the network subsystem, too" (in master) are both changing the way that NIC ID strings are created, and I don't know which is supposed to be the correct way. Please can you fix up the conflict appropriately and resend? thanks -- PMM
> 2021年3月14日 下午7:37，Peter Maydell <peter.maydell@linaro.org> 写道： > > On Fri, 12 Mar 2021 at 06:16, Jason Wang <jasowang@redhat.com <mailto: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) > "net: Use id_generate() in the network subsystem, too" (in master) > are both changing the way that NIC ID strings are created, and > I don't know which is supposed to be the correct way. > > Please can you fix up the conflict appropriately and resend? Will do. Thanks > > thanks > -- PMM
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? 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? Thomas
在 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
On Mon, Mar 15, 2021 at 9:10 AM Jason Wang <jasowang@redhat.com> wrote: > 在 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? Another candidate: "Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr()" https://www.mail-archive.com/qemu-devel@nongnu.org/msg789998.html
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) ---------------------------------------------------------------- ---------------------------------------------------------------- Alexander Bulekov (4): rtl8139: switch to use qemu_receive_packet() for loopback pcnet: switch to use qemu_receive_packet() for loopback cadence_gem: switch to use qemu_receive_packet() for loopback lan9118: switch to use qemu_receive_packet() for loopback Bin Meng (1): net: Fix build error when DEBUG_NET is on Cornelia Huck (1): pvrdma: wean code off pvrdma_ring.h kernel header Jason Wang (9): virtio-net: calculating proper msix vectors on init net: unbreak well-form id check for "-nic" e1000: fail early for evil descriptor net: introduce qemu_receive_packet() e1000: switch to use qemu_receive_packet() for loopback dp8393x: switch to use qemu_receive_packet() for loopback packet msf2-mac: switch to use qemu_receive_packet() for loopback sungem: switch to use qemu_receive_packet() for loopback tx_pkt: switch to use qemu_receive_packet_iov() for loopback Paolo Bonzini (1): net: validate that ids are well formed hw/core/machine.c | 1 + hw/net/cadence_gem.c | 4 +- hw/net/dp8393x.c | 2 +- hw/net/e1000.c | 6 +- hw/net/lan9118.c | 2 +- hw/net/msf2-emac.c | 2 +- hw/net/net_tx_pkt.c | 2 +- hw/net/pcnet.c | 2 +- hw/net/rtl8139.c | 2 +- hw/net/sungem.c | 2 +- hw/rdma/vmw/pvrdma.h | 5 +- hw/rdma/vmw/pvrdma_cmd.c | 6 +- hw/rdma/vmw/pvrdma_dev_ring.c | 41 ++++---- hw/rdma/vmw/pvrdma_dev_ring.h | 9 +- hw/rdma/vmw/pvrdma_main.c | 4 +- hw/virtio/virtio-net-pci.c | 10 +- include/net/net.h | 5 + include/net/queue.h | 8 ++ .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 114 --------------------- net/net.c | 53 ++++++++-- net/queue.c | 22 ++++ scripts/update-linux-headers.sh | 3 +- 22 files changed, 142 insertions(+), 163 deletions(-) delete mode 100644 include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h