Peter Maydell 61ead113ae Pull request ... v2: * Resolved merge conflict with block/iscsi.c [Peter] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJXj6TkAAoJEJykq7OBq3PI15oIAL24OFnMTFOAWyY2h3yfzGwe Gn1qzFOTHCXgbgVsolVuZnFU/SDn9WzMS9y6o7jcJykv++FdMSYUO7paPQAg9etX o9KOgyfUUDhskbaXEbTKxhqy7UvcyJsZYmjN+TD5tupfnrqGlmu6rkUPpSwGo++G u7CkAZewJc5SvsCdQRe3N10LbG4xU/j06cjCIHWDPRr+AV9qvsb9KkIOg3wkrhWN R83yj+yX6vhfQouHLoOlh3RYZ5HNo020JPum0jT1tGcoshKoFyu0prSRqNVVMqTY BepvWMhXbiq219HnFaQBtnysve9gWix4WhuCHtaAlaZDTBh945ZztsW7w7dubtA= =7ics -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging Pull request v2: * Resolved merge conflict with block/iscsi.c [Peter] # gpg: Signature made Wed 20 Jul 2016 17:20:52 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: (25 commits) raw_bsd: Convert to byte-based interface nbd: Convert to byte-based interface block: Kill .bdrv_co_discard() sheepdog: Switch .bdrv_co_discard() to byte-based raw_bsd: Switch .bdrv_co_discard() to byte-based qcow2: Switch .bdrv_co_discard() to byte-based nbd: Switch .bdrv_co_discard() to byte-based iscsi: Switch .bdrv_co_discard() to byte-based gluster: Switch .bdrv_co_discard() to byte-based blkreplay: Switch .bdrv_co_discard() to byte-based block: Add .bdrv_co_pdiscard() driver callback block: Convert .bdrv_aio_discard() to byte-based rbd: Switch rbd_start_aio() to byte-based raw-posix: Switch paio_submit() to byte-based block: Convert BB interface to byte-based discards block: Convert bdrv_aio_discard() to byte-based block: Switch BlockRequest to byte-based block: Convert bdrv_discard() to byte-based block: Convert bdrv_co_discard() to byte-based iscsi: Rely on block layer to break up large requests ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Conflicts: block/gluster.c		2016-07-21 11:00:36 +01:00
..
block	Pull request	2016-07-21 11:00:36 +01:00
crypto	Clean up ill-advised or unusual header guards	2016-07-12 16:20:46 +02:00
disas	disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers	2016-07-19 16:40:39 +01:00
exec	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
fpu	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
hw	x86 queue, 2016-07-20	2016-07-20 21:32:56 +01:00
io	Clean up ill-advised or unusual header guards	2016-07-12 16:20:46 +02:00
libdecnumber	Clean up ill-advised or unusual header guards	2016-07-12 16:20:46 +02:00
migration	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
monitor	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
net	net: Use correct type for bool flag	2016-07-19 20:18:27 +02:00
qapi	blockjob: Update description of the 'id' field	2016-07-13 13:26:02 +02:00
qemu	compiler: never omit assertions if using a static analysis tool	2016-07-17 09:59:21 +02:00
qom	trace: Add per-vCPU tracing states for events with the 'vcpu' property	2016-07-18 18:23:12 +01:00
standard-headers	linux-headers: update	2016-06-14 13:34:50 +02:00
sysemu	block: Convert BB interface to byte-based discards	2016-07-20 14:11:55 +01:00
ui	gtk: fix build	2016-07-11 10:40:29 +01:00
elf.h	Clean up ill-advised or unusual header guards	2016-07-12 16:20:46 +02:00
glib-compat.h	vhost-user-test: fix g_cond_wait_until compat implementation	2016-06-29 16:49:40 +02:00
qemu-common.h	qemu-common.h: Drop WORDS_ALIGNED define	2016-06-07 18:19:24 +03:00
qemu-io.h	qemu-io: Use BlockBackend	2015-02-16 15:07:19 +00:00
trace-tcg.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
trace.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00