[GIT PULL] (xen) stable/for-jens-3.3 for 3.3 merge window.

From: Konrad Rzeszutek Wilk
Date: Wed Dec 21 2011 - 10:34:41 EST


Hey Jens,

Please git pull the following git branch:

git pull git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-3.3

in your 3.3 drivers branch (which I don't see on your git tree actually?)

This branch provides a new feature to the blkback/blkfront protocol, which was
suggested by Christoph Hellwig which is the 'secure-discard' operation.

That is now implemented - it required a bit of packing the structs to re-use
a reserved field and doing tons of tests. As part of that feature, Li added
the support to passthrough the discard operation to the loopback device.

Also some code movement suggested by Jan Beulich and lastly a fix for
allocating an array.

Thanks and please pull!

drivers/block/xen-blkback/blkback.c | 84 ++++++++++++++--------------------
drivers/block/xen-blkback/common.h | 67 ++++++++++++++++------------
drivers/block/xen-blkback/xenbus.c | 12 +++++
drivers/block/xen-blkfront.c | 79 +++++++++++++++++++++------------
include/xen/interface/io/blkif.h | 40 ++++++++++++++---
5 files changed, 170 insertions(+), 112 deletions(-)

Konrad Rzeszutek Wilk (3):
xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
xen/blk[front|back]: Enhance discard support with secure erasing support.
xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io

Li Dongyang (1):
xen-blkback: convert hole punching to discard request on loop devices

Thomas Meyer (1):
xen-blkfront: Use kcalloc instead of kzalloc to allocate array

Attachment: pgp00000.pgp
Description: PGP signature