The following changes since commit 1b242c3b1ec7c6011901b4f3b4b0876e31746afb:

  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20200727' into staging (2020-07-28 13:46:31 +0100)

are available in the Git repository at:

  https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2020-07-28

for you to fetch changes up to 12c75e20a269ac917f4a76936d7142264e522233:

  block/nbd: nbd_co_reconnect_loop(): don't sleep if drained (2020-07-28 09:54:43 -0500)

Sorry this is down to the wire, Nir's patches were a pretty recent
discovery, but still counts as a bug fix worthy of having in -rc2.

----------------------------------------------------------------
nbd patches for 2020-07-28

- fix NBD handling of trim/zero requests larger than 2G
- allow no-op resizes on NBD (in turn fixing qemu-img convert -c into NBD)
- several deadlock fixes when using NBD reconnect

----------------------------------------------------------------
Eric Blake (1):
      nbd: Fix large trim/zero requests

Nir Soffer (4):
      block: nbd: Fix convert qcow2 compressed to nbd
      iotests: Make qemu_nbd_popen() a contextmanager
      iotests: Add more qemu_img helpers
      iotests: Test convert to qcow2 compressed to NBD

Vladimir Sementsov-Ogievskiy (4):
      block/nbd: split nbd_establish_connection out of nbd_client_connect
      block/nbd: allow drain during reconnect attempt
      block/nbd: on shutdown terminate connection attempt
      block/nbd: nbd_co_reconnect_loop(): don't sleep if drained

 block/nbd.c                   | 126 ++++++++++++++++++++++++++++++-----------
 nbd/server.c                  |  28 ++++++++--
 qemu-io-cmds.c                |   2 +-
 block/trace-events            |   4 +-
 tests/qemu-iotests/264        |  72 +++++++++---------------
 tests/qemu-iotests/264.out    |   2 +
 tests/qemu-iotests/302        | 127 ++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/302.out    |  31 +++++++++++
 tests/qemu-iotests/group      |   1 +
 tests/qemu-iotests/iotests.py |  34 ++++++++++-
 10 files changed, 340 insertions(+), 87 deletions(-)
 create mode 100755 tests/qemu-iotests/302
 create mode 100644 tests/qemu-iotests/302.out

-- 
2.27.0

On Tue, 28 Jul 2020 at 16:06, Eric Blake <eblake@redhat.com> wrote:
>
> The following changes since commit 1b242c3b1ec7c6011901b4f3b4b0876e31746afb:
>
>   Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20200727' into staging (2020-07-28 13:46:31 +0100)
>
> are available in the Git repository at:
>
>   https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2020-07-28
>
> for you to fetch changes up to 12c75e20a269ac917f4a76936d7142264e522233:
>
>   block/nbd: nbd_co_reconnect_loop(): don't sleep if drained (2020-07-28 09:54:43 -0500)
>
> Sorry this is down to the wire, Nir's patches were a pretty recent
> discovery, but still counts as a bug fix worthy of having in -rc2.
>
> ----------------------------------------------------------------
> nbd patches for 2020-07-28
>
> - fix NBD handling of trim/zero requests larger than 2G
> - allow no-op resizes on NBD (in turn fixing qemu-img convert -c into NBD)
> - several deadlock fixes when using NBD reconnect


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM