tree 27cba483a484d6f61de77a810a053ea7748eddc8
parent 52b9c816807abd46c285cd8ab183fe93194bfb3f
parent abbbdf12497d36b001e0865bc5bc6cc363f3a5e1
author Linus Torvalds <torvalds@linux-foundation.org> 1490823019 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1490823019 -0700

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

Pull block fixes from Jens Axboe:
 "Five fixes for this series:

   - a fix from me to ensure that blk-mq drivers that terminate IO in
     their ->queue_rq() handler by returning QUEUE_ERROR don't stall
     with a scheduler enabled.

   - four nbd fixes from Josef and Ratna, fixing various problems that
     are critical enough to go in for this cycle. They have been well
     tested"

* 'for-linus' of git://git.kernel.dk/linux-block:
  nbd: replace kill_bdev() with __invalidate_device()
  nbd: set queue timeout properly
  nbd: set rq->errors to actual error code
  nbd: handle ERESTARTSYS properly
  blk-mq: include errors in did_work calculation