Re: [PULL 00/16] Net patches

[Jason Wang]

在 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:
>
>  20210303095910.78277-1-lekiravi@yandex-team.ru/">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