| Message ID | 1422037218-31855-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 23 January 2015 at 18:20, Kevin Wolf <kwolf@redhat.com> wrote: > The following changes since commit c6441452b50c44fdbb362b239ce623f77cf3cd51: > > Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20150122-1' into staging (2015-01-22 18:57:36 +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 bc63781ca350cad4c9eb142ce8f55bfaded4276e: > > Merge remote-tracking branch 'mreitz/block' into queue-block (2015-01-23 18:51:47 +0100) > > ---------------------------------------------------------------- > > Block patches for 2.3 > > ---------------------------------------------------------------- Applied, thanks. -- PMM
The following changes since commit c6441452b50c44fdbb362b239ce623f77cf3cd51: Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20150122-1' into staging (2015-01-22 18:57:36 +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 bc63781ca350cad4c9eb142ce8f55bfaded4276e: Merge remote-tracking branch 'mreitz/block' into queue-block (2015-01-23 18:51:47 +0100) ---------------------------------------------------------------- Block patches for 2.3 ---------------------------------------------------------------- Fam Zheng (2): virtio-blk: Pass req to virtio_blk_handle_scsi_req virtio-blk: Use blk_aio_ioctl Jeff Cody (7): block: vmdk - make ret variable usage clear block: vmdk - move string allocations from stack to the heap block: qapi - move string allocation from stack to the heap block: remove unused variable in bdrv_commit block: mirror - change string allocation to 2-bytes block: update string sizes for filename,backing_file,exact_filename block: vhdx - force FileOffsetMB field to '0' for certain block states Kevin Wolf (1): Merge remote-tracking branch 'mreitz/block' into queue-block Max Reitz (3): qcow2: Add two more unalignment checks iotests: Add tests for more corruption cases iotests: Lower 064's memory usage block.c | 3 - block/mirror.c | 3 +- block/qapi.c | 7 ++- block/qcow.c | 2 +- block/qcow2-cluster.c | 21 +++++++ block/qcow2.c | 3 +- block/vhdx.c | 13 +++- block/vmdk.c | 51 +++++++++------- block/vvfat.c | 4 +- hw/block/virtio-blk.c | 134 ++++++++++++++++++++++++++--------------- include/block/block_int.h | 8 +-- include/hw/virtio/virtio-blk.h | 3 - qemu-img.c | 4 +- tests/qemu-iotests/060 | 15 +++++ tests/qemu-iotests/060.out | 13 ++++ tests/qemu-iotests/064 | 19 +++++- tests/qemu-iotests/064.out | 34 +++++++++-- 17 files changed, 239 insertions(+), 98 deletions(-)