The following changes since commit 47c1cc30e440860aa695358f7c2dd0b9d7b53d16:

  Update version for v3.1.0-rc2 release (2018-11-20 18:10:26 +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 6bd858b3117a5aab066f3cf02ca72000eaa10ddb:

  block: Update BlockDriverState.inherits_from on bdrv_drop_intermediate() (2018-11-22 19:37:31 +0100)

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

- block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options()
- block: Fix option inheritance after stream/commit job graph changes
- qemu-img: Fix memory leak and typo in error message
- nvme: Fixes for lockups and crashes
- scsi-disk: Fix crash if underlying host file or disk returns error
- Several qemu-iotests fixes and improvements

----------------------------------------------------------------
Alberto Garcia (3):
      block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options()
      block: Update BlockDriverState.inherits_from on bdrv_set_backing_hd()
      block: Update BlockDriverState.inherits_from on bdrv_drop_intermediate()

Daniel P. Berrangé (1):
      iotests: fix nbd test 233 to work correctly with raw images

Eric Blake (2):
      iotests: Skip 233 if certtool not installed
      iotests: Enhance 223 to cover multiple bitmap granularities

Igor Druzhinin (1):
      nvme: call blk_drain in NVMe reset code to avoid lockups

Kevin Wolf (3):
      iotests: Replace time.clock() with Timeout
      iotests: Replace assertEquals() with assertEqual()
      Revert "nvme: fix oob access issue(CVE-2018-16847)"

Logan Gunthorpe (1):
      nvme: fix bug with PCI IRQ pins on teardown

Max Reitz (2):
      qemu-img: Fix typo
      qemu-img: Fix leak

Paolo Bonzini (2):
      nvme: fix out-of-bounds access to the CMB
      nvme: fix CMB endianness confusion

Richard W.M. Jones (1):
      scsi-disk: Fix crash if underlying host file or disk returns error

 block.c                       |  41 ++++++++++++-
 hw/block/nvme.c               |  19 ++----
 hw/scsi/scsi-disk.c           |   2 +-
 qemu-img.c                    |   3 +-
 tests/nvme-test.c             |  68 ++++++++++++++++++---
 tests/Makefile.include        |   2 +-
 tests/qemu-iotests/041        |   6 +-
 tests/qemu-iotests/118        |  20 +++---
 tests/qemu-iotests/161        | 137 ++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/161.out    |  39 ++++++++++++
 tests/qemu-iotests/223        |  43 ++++++++++---
 tests/qemu-iotests/223.out    |  32 +++++++---
 tests/qemu-iotests/233        |   9 ++-
 tests/qemu-iotests/common.tls |   3 +
 tests/qemu-iotests/group      |   1 +
 tests/qemu-iotests/iotests.py |   2 +-
 16 files changed, 364 insertions(+), 63 deletions(-)
 create mode 100755 tests/qemu-iotests/161
 create mode 100644 tests/qemu-iotests/161.out

On 22 November 2018 at 18:45, Kevin Wolf <kwolf@redhat.com> wrote:
> The following changes since commit 47c1cc30e440860aa695358f7c2dd0b9d7b53d16:
>
>   Update version for v3.1.0-rc2 release (2018-11-20 18:10:26 +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 6bd858b3117a5aab066f3cf02ca72000eaa10ddb:
>
>   block: Update BlockDriverState.inherits_from on bdrv_drop_intermediate() (2018-11-22 19:37:31 +0100)
>
> ----------------------------------------------------------------
> Block layer patches:
>
> - block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options()
> - block: Fix option inheritance after stream/commit job graph changes
> - qemu-img: Fix memory leak and typo in error message
> - nvme: Fixes for lockups and crashes
> - scsi-disk: Fix crash if underlying host file or disk returns error
> - Several qemu-iotests fixes and improvements
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM