From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Mar 2017 21:30:19 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v4.11-rc5~28
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=806276b7f07a39a1cc3f38bb1ef5c573d4594a38;p=linux.git

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
---

806276b7f07a39a1cc3f38bb1ef5c573d4594a38