From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 19 Oct 2011 20:31:58 +0000 (-0400)
Subject: Merge branch 'stable/xen-block.rebase' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~854^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f5aafb52a4a841b9b310dc43e7d75c07de62c6ec;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/xen-block.rebase' into uek2-merge

* stable/xen-block.rebase:
  xen/blkback: Fix two races in the handling of barrier requests.
  xen/blkback: Check for proper operation.
  xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
  xen/blkback: Report VBD_WSECT (wr_sect) properly.
  xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.
  xen-blkfront: plug device number leak in xlblk_init() error path
  xen-blkfront: If no barrier or flush is supported, use invalid operation.
  xen-blkback: use kzalloc() in favor of kmalloc()+memset()
  xen-blkback: fixed indentation and comments
  xen-blkfront: fix a deadlock while handling discard response
  xen-blkfront: Handle discard requests.
  xen-blkback: Implement discard requests ('feature-discard')
  xen-blkfront: add BLKIF_OP_DISCARD and discard request struct
  xen/blkback: Add module alias for autoloading
  xen/blkback: Don't let in-flight requests defer pending ones.

Conflicts:
	drivers/block/xen-blkback/blkback.c
---

f5aafb52a4a841b9b310dc43e7d75c07de62c6ec