diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-11-09 16:54:29 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-11-09 16:54:29 -0500 |
| commit | eccada5bdada737f0e2dca554833c9f98225a133 (patch) | |
| tree | f41862adc74a3bcbe010e4f302c61091e89e17a9 | |
| parent | b08a2f34916e06d001288f33b7fc407c04650b43 (diff) | |
| parent | cb73a44fd3b42ba7e471170048551e24d0cdc6e2 (diff) | |
| parent | f0a7f4e7ce92fc645af65c69fa77278f0649ee2e (diff) | |
| download | xen-eccada5bdada737f0e2dca554833c9f98225a133.tar.gz | |
Merge branches 'devel/for-jens-3.3' and 'devel/xen-scsi.v1.0' into testing
* devel/for-jens-3.3:
xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io
xen/blk[front|back]: Enhance discard support with secure erasing support.
xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
block: xen-blkback: use API provided by xenbus module to map rings
* devel/xen-scsi.v1.0:
xen-scsi[front|back]: Fix warnings and bugs.
xen/scsi[front|back]: Forgot .owner attribute.
xen/scsi[front|back]: Initial commit from Novell SLES11SP1 2.6.32 tree.