The following changes since commit 2e3a76ae3e47d502f9f0c4424b719945fba9d459:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160404'
into staging (2016-04-04 17:43:39 +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 6a5c357fdbd4c91c5142f1b7ccf4658664b52ea2:
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-05'
into queue-block (2016-04-05 17:31:20 +0200)
----------------------------------------------------------------
Block layer patches for 2.6
----------------------------------------------------------------
Eric Blake (1):
crypto: Avoid memory leak on failure
Fam Zheng (1):
qemu-iotests: 149: Use "/usr/bin/env python"
Kevin Wolf (2):
block: Forbid I/O throttling on nodes with multiple parents for 2.6
Merge remote-tracking branch
'mreitz/tags/pull-block-for-kevin-2016-04-05' into queue-block
Paolo Bonzini (1):
block: forbid x-blockdev-del from acting on DriveInfo
block.c | 7 +++++++
block/crypto.c | 12 ++++++------
blockdev.c | 12 ++++++++++++
tests/qemu-iotests/149 | 2 +-
4 files changed, 26 insertions(+), 7 deletions(-)
