]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'stable/for-jens-3.2' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 10 Oct 2011 18:12:42 +0000 (14:12 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 10 Oct 2011 18:12:42 +0000 (14:12 -0400)
commitb0b69124182bed93c9ee46726faeb92cca44e461
tree5d5be6423c6ec3e02e25385311d737cd40c25382
parente54339ce6a3d094789ad74a78548799f2fddf521
parentf74cc58b77c2a1c1a93c0324a50b9d1b9a0cb159
Merge branch 'stable/for-jens-3.2' into linux-next

* stable/for-jens-3.2:
  xen/blk[front|back]: Enhance discard support with secure erasing support.
  xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
  xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.
  xen/blkback: Report VBD_WSECT (wr_sect) properly.
  xen-blkfront: plug device number leak in xlblk_init() error path
drivers/block/xen-blkback/blkback.c
drivers/block/xen-blkback/xenbus.c