The following changes since commit f3a1b5068cea303a55e2a21a97e66d057eaae638:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-07-13 13:35:51 +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 e34d8f297d51b7ffa5dce72df1e45fa94cff989c: rbd: fix ceph settings precedence (2015-07-14 17:15:23 +0200) ---------------------------------------------------------------- Block layer patches for 2.4.0-rc1 ---------------------------------------------------------------- Christoph Hellwig (2): nvme: implement the Flush command nvme: properly report volatile write caches Josh Durgin (4): rbd: remove unused constants and fields MAINTAINERS: update email address rbd: make qemu's cache setting override any ceph setting rbd: fix ceph settings precedence Kevin Wolf (5): block: Move bdrv_attach_child() calls up the call chain block: Introduce bdrv_open_child() block: Introduce bdrv_unref_child() block: Reorder cleanups in bdrv_close() block: Fix backing file child when modifying graph MAINTAINERS | 2 +- block.c | 144 ++++++++++++++++++++++++++++++++-------------- block/rbd.c | 64 +++++++++++---------- hw/block/nvme.c | 38 +++++++++--- hw/block/nvme.h | 1 + include/block/block.h | 7 +++ include/block/block_int.h | 5 +- 7 files changed, 177 insertions(+), 84 deletions(-)