From: Peter Maydell <peter.maydell@linaro.org>
To: Laurent Vivier <lvivier@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>, qemu-devel@nongnu.org
Subject: Re: [PULL 00/11] Net patches
Date: Sun, 5 Feb 2023 12:36:46 +0000 [thread overview]
Message-ID: <CAFEAcA9Z4G74W8k4t3=+vJ5x-W6Skuq_rjbxEj7GHq+7BWEeug@mail.gmail.com> (raw)
In-Reply-To: <fe517a25-b7fc-3227-fb1b-b10be66898f0@redhat.com>
On Sat, 4 Feb 2023 at 20:09, Laurent Vivier <lvivier@redhat.com> wrote:
>
> On 2/4/23 15:57, Peter Maydell wrote:
> > On Thu, 2 Feb 2023 at 06:21, Jason Wang <jasowang@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.
thanks
-- PMM
next prev parent reply other threads:[~2023-02-05 12:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 6:21 [PULL 00/11] Net patches Jason Wang
2023-02-02 6:21 ` [PULL 01/11] net: Move the code to collect available NIC models to a separate function Jason Wang
2023-02-02 6:21 ` [PULL 02/11] net: Restore printing of the help text with "-nic help" Jason Wang
2023-02-02 6:21 ` [PULL 03/11] net: Replace "Supported NIC models" with "Available NIC models" Jason Wang
2023-02-02 6:21 ` [PULL 04/11] hw/net/lan9118: log [read|write]b when mode_16bit is enabled rather than abort Jason Wang
2023-02-02 6:21 ` [PULL 05/11] hw/net/vmxnet3: allow VMXNET3_MAX_MTU itself as a value Jason Wang
2023-02-02 6:21 ` [PULL 06/11] net: Increase L2TPv3 buffer to fit jumboframes Jason Wang
2023-02-02 6:21 ` [PULL 07/11] vmnet: stop recieving events when VM is stopped Jason Wang
2023-02-02 6:21 ` [PULL 08/11] hw/net/can/xlnx-zynqmp-can: fix assertion failures in transfer_fifo() Jason Wang
2023-02-02 6:21 ` [PULL 09/11] tests/qtest: netdev: test stream and dgram backends Jason Wang
2023-02-02 6:21 ` [PULL 10/11] net: stream: add a new option to automatically reconnect Jason Wang
2023-02-02 6:21 ` [PULL 11/11] vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check Jason Wang
2023-02-04 14:57 ` [PULL 00/11] Net patches Peter Maydell
2023-02-04 20:09 ` Laurent Vivier
2023-02-05 12:36 ` Peter Maydell [this message]
2023-02-06 8:23 ` Laurent Vivier
2023-02-13 3:59 ` Jason Wang
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='CAFEAcA9Z4G74W8k4t3=+vJ5x-W6Skuq_rjbxEj7GHq+7BWEeug@mail.gmail.com' \
--to=peter.maydell@linaro.org \
--cc=jasowang@redhat.com \
--cc=lvivier@redhat.com \
--cc=qemu-devel@nongnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.