]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e54339c f74cc58)
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)
* 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

1  2 
drivers/block/xen-blkback/blkback.c patch | diff1 | diff2 | blob | history
drivers/block/xen-blkback/xenbus.c patch | diff1 | diff2 | blob | history

diff --cc drivers/block/xen-blkback/blkback.c
Simple merge
diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge
Linux kernel for KaRo TX COM modules