The following changes since commit b34181056c04e05db6c632063012beaee7006a37:

  Merge remote-tracking branch 'remotes/rth/tags/pull-sh4-20180709' into staging (2018-07-09 22:44:22 +0100)

are available in the git repository at:

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

for you to fetch changes up to cd47d792d7a27a57f4b621e2ff1ed8f4e83de1e9:

  block: Use common write req handling in truncate (2018-07-10 16:46:22 +0200)

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

- Copy offloading fixes for when the copy increases the image size
- Temporary revert of the removal of deprecated -drive options
- Fix request serialisation in the image fleecing scenario
- Fix copy-on-read crash with unaligned image size
- Fix another drain crash

----------------------------------------------------------------
Ari Sundholm (2):
      qapi/block-core.json: Add missing documentation for blklogwrites log-append option
      block/blklogwrites: Make sure the log sector size is not too small

Cornelia Huck (4):
      Revert "block: Remove dead deprecation warning code"
      Revert "block: Remove deprecated -drive option serial"
      Revert "block: Remove deprecated -drive option addr"
      Revert "block: Remove deprecated -drive geometry options"

Fam Zheng (11):
      iotests: 222: Don't run with luks
      block: Prefix file driver trace points with "file_"
      block: Add copy offloading trace points
      block: Use BdrvChild to discard
      block: Use uint64_t for BdrvTrackedRequest byte fields
      block: Extract common write req handling
      block: Fix handling of image enlarging write
      block: Use common req handling for discard
      block: Use common req handling in copy offloading
      block: Fix bdrv_co_truncate overlap check
      block: Use common write req handling in truncate

Kevin Wolf (3):
      block: Poll after drain on attaching a node
      test-bdrv-drain: Test bdrv_append() to drained node
      block: Fix copy-on-read crash with partial final cluster

Vladimir Sementsov-Ogievskiy (4):
      block/io: fix copy_range
      block: split flags in copy_range
      block: add BDRV_REQ_SERIALISING flag
      block/backup: fix fleecing scheme: use serialized writes

 qapi/block-core.json           |   2 +
 include/block/block.h          |  41 +++++-
 include/block/block_int.h      |  21 ++-
 include/hw/block/block.h       |   1 +
 include/sysemu/block-backend.h |   3 +-
 include/sysemu/blockdev.h      |   3 +
 block.c                        |   2 +-
 block/backup.c                 |  20 ++-
 block/blkdebug.c               |   2 +-
 block/blklogwrites.c           |   7 +-
 block/blkreplay.c              |   2 +-
 block/block-backend.c          |   8 +-
 block/copy-on-read.c           |   2 +-
 block/file-posix.c             |  25 ++--
 block/file-win32.c             |   2 +-
 block/io.c                     | 318 ++++++++++++++++++++++++++++-------------
 block/iscsi.c                  |  12 +-
 block/mirror.c                 |   2 +-
 block/qcow2-refcount.c         |   2 +-
 block/qcow2.c                  |  20 +--
 block/raw-format.c             |  26 ++--
 block/throttle.c               |   2 +-
 blockdev.c                     | 110 ++++++++++++++
 device-hotplug.c               |   4 +
 hw/block/block.c               |  27 ++++
 hw/block/nvme.c                |   1 +
 hw/block/virtio-blk.c          |   1 +
 hw/ide/qdev.c                  |   1 +
 hw/scsi/scsi-disk.c            |   1 +
 hw/usb/dev-storage.c           |   1 +
 qemu-img.c                     |   2 +-
 tests/ahci-test.c              |   6 +-
 tests/hd-geo-test.c            |  37 ++++-
 tests/ide-test.c               |   8 +-
 tests/test-bdrv-drain.c        |  43 ++++++
 block/trace-events             |  10 +-
 hmp-commands.hx                |   1 +
 qemu-doc.texi                  |  15 ++
 qemu-options.hx                |  14 +-
 tests/qemu-iotests/197         |   9 ++
 tests/qemu-iotests/197.out     |   8 ++
 tests/qemu-iotests/222         |   2 +
 42 files changed, 647 insertions(+), 177 deletions(-)

On 10 July 2018 at 16:42, Kevin Wolf <kwolf@redhat.com> wrote:
> The following changes since commit b34181056c04e05db6c632063012beaee7006a37:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-sh4-20180709' into staging (2018-07-09 22:44:22 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to cd47d792d7a27a57f4b621e2ff1ed8f4e83de1e9:
>
>   block: Use common write req handling in truncate (2018-07-10 16:46:22 +0200)
>
> ----------------------------------------------------------------
> Block layer patches:
>
> - Copy offloading fixes for when the copy increases the image size
> - Temporary revert of the removal of deprecated -drive options
> - Fix request serialisation in the image fleecing scenario
> - Fix copy-on-read crash with unaligned image size
> - Fix another drain crash
>
> ----------------------------------------------------------------



Applied, thanks.

-- PMM