> 2021年3月14日 下午7:37，Peter Maydell <peter.mayd...@linaro.org> 写道： > > On Fri, 12 Mar 2021 at 06:16, Jason Wang <jasow...@redhat.com > <mailto:jasow...@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
