]> 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>
Tue, 11 Oct 2011 19:05:32 +0000 (15:05 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 11 Oct 2011 19:05:32 +0000 (15:05 -0400)
commit9fda08fac20480d18a27daed4ff3ff995a7cbc11
tree0d402b46348b6238a1f73eff7ce0607452e1aaf9
parenta29cb479a9f2eba40f88ae99178bf4eb09a67f86
parent3b8b8384e8a1d6f63afb79e66ba4c3a1a97acb4b
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.
drivers/block/xen-blkback/blkback.c
drivers/block/xen-blkback/xenbus.c
drivers/block/xen-blkfront.c