[GIT PULL] (bugfixes, xen) for for-3.4/drivers

Konrad Rzeszutek Wilk
2012-03-24T16:53:16Z

[-- Attachment #1: Type: text/plain, Size: 982 bytes --]

Hey Jens,

I've two small fixes for the xen-blkback - and I think one more will show up
eventually (a partial revert), but not sure when. So in the spirit of keeping
the patches flowing, please git pull the following branch:

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

which is based of your for-3.4/drivers, git commit bc67f63650fad6b3478d9ddfd5406d45a95987c9
Stephen M. Cameron (1):
cciss: Fix scsi tape io with more than 255 scatter gather elements

and has the following two commits:
Konrad Rzeszutek Wilk (2):
xen/blkback: Squash the discard support for 'file' and 'phy' type.
xen/blkback: Make optional features be really optional.

drivers/block/xen-blkback/blkback.c | 19 +++----
drivers/block/xen-blkback/common.h | 6 --
drivers/block/xen-blkback/xenbus.c | 89 ++++++++++++----------------------
3 files changed, 40 insertions(+), 74 deletions(-)

Thank you!

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]