aboutsummaryrefslogtreecommitdiff
path: root/include/linux/wimax
diff options
context:
space:
mode:
authorLinus Torvalds2015-01-15 10:27:56 +1300
committerLinus Torvalds2015-01-15 10:27:56 +1300
commit31238e61b51f5a68bb8630ddb60ede475846d698 (patch)
tree64ed1e7160d79a345ee357d9a8445176e722e170 /include/linux/wimax
parent188c901941efd43cbf21e8f4f9e9a276536b989c (diff)
parent7a509a6b07dd5a08d91f8a7e0cccb9a6438ce439 (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe: "The major part is an update to the NVMe driver, fixing various issues around surprise removal and hung controllers. Most of that is from Keith, and parts are simple blk-mq fixes or exports/additions of minor functions to aid this effort, and parts are changes directly to the NVMe driver. Apart from the above, this contains: - Small blk-mq change from me, killing an unused member of the hardware queue structure. - Small fix from Ming Lei, fixing up a few drivers that didn't properly check for ERR_PTR() returns from blk_mq_init_queue()" * 'for-linus' of git://git.kernel.dk/linux-block: NVMe: Fix locking on abort handling NVMe: Start and stop h/w queues on reset NVMe: Command abort handling fixes NVMe: Admin queue removal handling NVMe: Reference count admin queue usage NVMe: Start all requests blk-mq: End unstarted requests on a dying queue blk-mq: Allow requests to never expire blk-mq: Add helper to abort requeued requests blk-mq: Let drivers cancel requeue_work blk-mq: Export if requests were started blk-mq: Wake tasks entering queue on dying blk-mq: get rid of ->cmd_size in the hardware queue block: fix checking return value of blk_mq_init_queue block: wake up waiters when a queue is marked dying NVMe: Fix double free irq blk-mq: Export freeze/unfreeze functions blk-mq: Exit queue on alloc failure
Diffstat (limited to 'include/linux/wimax')
0 files changed, 0 insertions, 0 deletions