The following changes since commit 785a602eae7ad97076b9794ebaba072ad4a9f74f:

  Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190613-pull-request' into staging (2019-06-13 13:25:25 +0100)

are available in the Git repository at:

  https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2019-06-13

for you to fetch changes up to 611ae1d71647c58b23dc2c116a946884ce30abf8:

  block/nbd: merge NBDClientSession struct back to BDRVNBDState (2019-06-13 10:00:42 -0500)

----------------------------------------------------------------
nbd patches for 2019-06-13

- add 'qemu-nbd --pid-file'
- NBD-related iotest improvements
- NBD code refactoring in preparation for reconnect

----------------------------------------------------------------
Eric Blake (1):
      nbd/server: Nicer spelling of max BLOCK_STATUS reply length

Max Reitz (5):
      qemu-nbd: Add --pid-file option
      iotests.py: Add qemu_nbd_early_pipe()
      qemu-nbd: Do not close stderr
      iotests: Use qemu-nbd's --pid-file
      iotests: Let 233 run concurrently

Vladimir Sementsov-Ogievskiy (3):
      block/nbd-client: drop stale logout
      block/nbd: merge nbd-client.* to nbd.c
      block/nbd: merge NBDClientSession struct back to BDRVNBDState

 qemu-nbd.texi                 |    2 +
 block/nbd-client.h            |   71 ---
 block/nbd-client.c            | 1226 ---------------------------------------
 block/nbd.c                   | 1282 +++++++++++++++++++++++++++++++++++++++--
 nbd/server.c                  |   13 +-
 qemu-nbd.c                    |   14 +-
 tests/qemu-iotests/common.nbd |  100 ++--
 tests/qemu-iotests/common.rc  |    6 +-
 block/Makefile.objs           |    2 +-
 block/trace-events            |    4 +-
 tests/qemu-iotests/147        |    4 +-
 tests/qemu-iotests/233        |    1 -
 tests/qemu-iotests/iotests.py |    9 +-
 13 files changed, 1329 insertions(+), 1405 deletions(-)
 delete mode 100644 block/nbd-client.h
 delete mode 100644 block/nbd-client.c

-- 
2.20.1

On Thu, 13 Jun 2019 at 18:13, Eric Blake <eblake@redhat.com> wrote:
>
> The following changes since commit 785a602eae7ad97076b9794ebaba072ad4a9f74f:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190613-pull-request' into staging (2019-06-13 13:25:25 +0100)
>
> are available in the Git repository at:
>
>   https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2019-06-13
>
> for you to fetch changes up to 611ae1d71647c58b23dc2c116a946884ce30abf8:
>
>   block/nbd: merge NBDClientSession struct back to BDRVNBDState (2019-06-13 10:00:42 -0500)
>
> ----------------------------------------------------------------
> nbd patches for 2019-06-13
>
> - add 'qemu-nbd --pid-file'
> - NBD-related iotest improvements
> - NBD code refactoring in preparation for reconnect
>
> ----------------------------------------------------------------



Applied, thanks.

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

-- PMM