(xen) stable/for-jens-3.3 for 3.3 merge window.

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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Pulled, thanks!

- --
Jens Axboe

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJO90V8AAoJEPfTWPspceCm250QAKvQyqyMuP0RT85tscp4rGoS NzcipeAPOUH7+b0gwzzxbo0CeuynfNppBQM5fJMG6S/6hbCrBSAu2SnRklq1aVdd 6SfhHu+7TXZVyO3FUMgKJ80D/FZ4cKFZlfMQaPTF2Rj/a8teyr2mGsSUhrq8Y+xk 5V4+6LH61FfkJprUOflU1KB7vFht4V3PkM8ZWHLJawIU0LyhdixBLkmt8RcXahfH 04Dctz3O7gOVGwx2WBpmMBPxI88eMiHwsDs2BTYrPIj3hE/Az8lY7phEv5UddR+M IsCKm4iqbCFkSgqKIamh2Dj6tHls/9aBJmsL7MMxCHlXqYl8/RBzVxrePiei/KFp 3zUWS+P8XDNrsZKRNfJ2EKiUylv9nnA/TCkoJbRaLRhz9IH/84uVsANMtJ7LCMAL YoR2OWZj/CPa5Pz8zQvbkC8o0oY8d1ry6OtiKpQov51S19K2Td/zFocCytNjNEtz dxWLJkEeBgYgtgU2svmj2c1hd9N4ZpBAibWr9/qbPy20w4ewe8tvjI+VgOsBHl/3 Vnnj0nRng9kvSBya0XqohaZurnN2LKrcMBBvHFmayx62oOpGJv1G9iTmmQeLaaKG K13v5hxqeGWW+k2dnVop+5otsh/tEpHCc9+R1XsL4UHBQVu5FQ8x39Sooi7CeUcI BYkOAttJ4ZGBFUHaXXKZ
=8IMh
-----END PGP SIGNATURE-----

Thank you!

BTW, what did you think of these two patches:

http://mid.gmane.org/[email protected]
http://mid.gmane.org/[email protected]

Can I have your ACK to carry those in my tree and submit them to Linus directly? The full thread is:

http://marc.info/[email protected]