The following changes since commit 1aae36df4b8ed884c6ef6995e70c67fad79b49df:
Merge remote-tracking branch 'remotes/armbru/tags/pull-ivshmem-2015-11-25'
into staging (2015-11-25 11:38:03 +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 8c34d891b1594840d8394a3c9b92236c13254fd8:
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-25'
into queue-block (2015-11-25 14:33:01 +0100)
----------------------------------------------------------------
Block layer patches
----------------------------------------------------------------
Fam Zheng (1):
qemu-iotests: Add -nographic when starting QEMU in 119 and 120
Kevin Wolf (3):
tests/Makefile: Add more dependencies for test-timed-average
test-aio: Fix event notifier cleanup
Merge remote-tracking branch
'mreitz/tags/pull-block-for-kevin-2015-11-25' into queue-block
Markus Armbruster (1):
block/qapi: Plug memory leak on query-block error path
Programmingkid (1):
raw-posix.c: Make GetBSDPath() handle caching options
Ricard Wanderlof (1):
nand: fix flash erase when oob is in memory
block/qapi.c | 8 +++-----
block/raw-posix.c | 15 +++++++++------
hw/block/nand.c | 2 +-
tests/Makefile | 3 +--
tests/qemu-iotests/119 | 2 +-
tests/qemu-iotests/120 | 2 +-
tests/test-aio.c | 1 +
7 files changed, 17 insertions(+), 16 deletions(-)