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.

diff --cc drivers/block/xen-blkback/blkback.c
Simple merge

diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge

diff --cc drivers/block/xen-blkfront.c
Simple merge