On Fri, 9 Oct 2020 at 20:35, Stefan Hajnoczi <stefa...@redhat.com> wrote: > > The following changes since commit 497d415d76b9f59fcae27f22df1ca2c3fa4df64e: > > Merge remote-tracking branch > 'remotes/pmaydell/tags/pull-target-arm-20201008-1' into staging (2020-10-08 > 21:41:20 +0100) > > are available in the Git repository at: > > https://gitlab.com/stefanha/qemu.git tags/block-pull-request > > for you to fetch changes up to e969c7b045c90368bc3a5db3479e70b6f0ecb828: > > iotests: add commit top->base cases to 274 (2020-10-09 14:32:24 +0100) > > ---------------------------------------------------------------- > Pull request > > This pull request includes the vhost-user-blk server by Coiby Xu, the block > coroutine code generator by Vladimir Sementsov-Ogievskiy, nvme block driver > statistics by Philippe Mathieu-Daudé, and cleanups/fixes/additions to the > vhost-user-blk server by me. >
Hi; this seems to have a conflict in qemu-nbd.c with something that landed in the latest nbd pullreq. Could you fix up and resend, please? thanks -- PMM
