tree 3390cc1b7a428078337aa2e737440f6479fd673e
parent 6b476e114061599a6ab8d5464a5e16989cb98653
parent e162b219ae6a64be353f254bd4ba1c9627c67749
author Linus Torvalds <torvalds@linux-foundation.org> 1439498672 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1439498672 -0700

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull xen block driver fixes from Jens Axboe:
 "A few small bug fixes for xen-blk{front,back} that have been sitting
  over my vacation"

* 'for-linus' of git://git.kernel.dk/linux-block:
  xen-blkback: replace work_pending with work_busy in purge_persistent_gnt()
  xen-blkfront: don't add indirect pages to list when !feature_persistent
  xen-blkfront: introduce blkfront_gather_backend_features()