Merge branch 'stable/for-jens' into linux-next

* stable/for-jens:
  xen/blkback: Make description more obvious.
  xen-blkback: refactor vbd remove/disconnect.
  xen-blkback: repleace check kthread_should_stop() to remove_requested in xen_blkif_schedule() loop.
  xen-blkback: add remove_requested to xen_blkif and some declares
  xen/blk[front|back]: Implement the full FLUSH | FUA support.
  xen-blkfront: Fix one off warning about name clash
  xen-blkfront: Drop name and minor adjustments for emulated scsi devices

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