The following changes since commit b98a66201dbc7cf3b962f4bb260f66100cc75578:

  Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc0-2' into staging (2019-03-19 12:55:02 +0000)

are available in the Git repository at:

  git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 59fba0aaee7438002d9803a86c888f21a1070cc8:

  qemu-iotests: Treat custom TEST_DIR in 051 (2019-03-19 15:51:31 +0100)

----------------------------------------------------------------
Block layer patches:

- mirror: Fix early return from drain (could cause deadlocks)
- vmdk: Fixed probing for version 3 images
- vl: Fix to create migration object before block backends again (fixes
  segfault for block drivers that set migration blockers)
- Several minor fixes, documentation and test case improvements

----------------------------------------------------------------
Alberto Garcia (1):
      block: Make bdrv_{copy_on_read,crypto_luks,replication} static

Kevin Wolf (3):
      qcow2: Fix data file error condition in qcow2_co_create()
      block: Silence Coverity in bdrv_drop_intermediate()
      qemu-iotests: Fix 232 for non-qcow2

Lukáš Doktor (1):
      qemu-iotests: Treat custom TEST_DIR in 051

Markus Armbruster (1):
      vl: Fix to create migration object before block backends again

Max Reitz (1):
      blockdev: Check @replaces in blockdev_mirror_common

Sam Eiderman (1):
      vmdk: Support version=3 in VMDK descriptor files

Sergio Lopez (2):
      mirror: Confirm we're quiesced only if the job is paused or cancelled
      iotests: 153: Wait for an answer to QMP commands

Vladimir Sementsov-Ogievskiy (2):
      qapi: fix block-latency-histogram-set description and examples
      blockjob: fix user pause in block_job_error_action

 qapi/block-core.json       | 10 +++---
 block.c                    |  7 ++--
 block/copy-on-read.c       |  2 +-
 block/crypto.c             |  2 +-
 block/mirror.c             | 16 ++++++++++
 block/qcow2.c              |  2 +-
 block/replication.c        |  2 +-
 block/vmdk.c               |  6 ++--
 blockdev.c                 | 55 +++++++++++++++++++-------------
 blockjob.c                 |  8 +++--
 vl.c                       | 15 +++++----
 tests/qemu-iotests/051     |  2 +-
 tests/qemu-iotests/153     | 12 +++----
 tests/qemu-iotests/153.out |  6 ++++
 tests/qemu-iotests/232     | 30 ------------------
 tests/qemu-iotests/232.out | 20 ------------
 tests/qemu-iotests/247     | 79 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/247.out | 22 +++++++++++++
 tests/qemu-iotests/group   |  1 +
 19 files changed, 193 insertions(+), 104 deletions(-)
 create mode 100755 tests/qemu-iotests/247
 create mode 100644 tests/qemu-iotests/247.out

On Tue, 19 Mar 2019 at 15:46, Kevin Wolf <kwolf@redhat.com> wrote:
>
> The following changes since commit b98a66201dbc7cf3b962f4bb260f66100cc75578:
>
>   Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc0-2' into staging (2019-03-19 12:55:02 +0000)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to 59fba0aaee7438002d9803a86c888f21a1070cc8:
>
>   qemu-iotests: Treat custom TEST_DIR in 051 (2019-03-19 15:51:31 +0100)
>
> ----------------------------------------------------------------
> Block layer patches:
>
> - mirror: Fix early return from drain (could cause deadlocks)
> - vmdk: Fixed probing for version 3 images
> - vl: Fix to create migration object before block backends again (fixes
>   segfault for block drivers that set migration blockers)
> - Several minor fixes, documentation and test case improvements
>
> ----------------------------------------------------------------

Applied, thanks.

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

-- PMM