On Mon, Feb 6, 2023 at 4:23 PM Laurent Vivier <lviv...@redhat.com> wrote: > > On 2/5/23 13:36, Peter Maydell wrote: > > On Sat, 4 Feb 2023 at 20:09, Laurent Vivier <lviv...@redhat.com> wrote: > >> > >> On 2/4/23 15:57, Peter Maydell wrote: > >>> On Thu, 2 Feb 2023 at 06:21, Jason Wang <jasow...@redhat.com> wrote: > >>>> > >>>> The following changes since commit > >>>> 13356edb87506c148b163b8c7eb0695647d00c2a: > >>>> > >>>> Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu > >>>> into staging (2023-01-24 09:45:33 +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 2bd492bca521ee8594f1d5db8dc9aac126fc4f85: > >>>> > >>>> vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check (2023-02-02 14:16:48 > >>>> +0800) > >>>> > >>>> ---------------------------------------------------------------- > >>> > >>> Something weird has happened here -- this pullreq is trying to > >>> add tests/qtest/netdev-socket.c, but it already exists in the > >>> tree and doesn't have the same contents as the version in your > >>> pull request. > >>> > >>> Can you look at what's happened here and fix it up, please ? > >> > >> Thomas and Jason have queued the patch: > >> > >> tests/qtest: netdev: test stream and dgram backends > >> > >> For Jason it's because it's needed by > >> > >> net: stream: add a new option to automatically reconnect > >> > >> For me, both patches (in tree and Jason's one) are identical to my v7 > >> (except the one that is merged does not have Thomas' acked-by). > > > > When I tried to merge the pullreq I got conflicts because they > > weren't the same, notably in the set of #include lines. > > The differences in the file are introduced by the following patch 10/11: > > 5b28ced1bc6d net: stream: add a new option to automatically reconnect > > Thanks, > Laurent >
Will send a new version of the pull (dropping the duplicated commit). Thanks
