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
No related branches found
No related tags found
Showing
- block/blk-core.c 20 additions, 1 deletionblock/blk-core.c
- block/blk-mq-tag.c 10 additions, 4 deletionsblock/blk-mq-tag.c
- block/blk-mq-tag.h 1 addition, 0 deletionsblock/blk-mq-tag.h
- block/blk-mq.c 69 additions, 6 deletionsblock/blk-mq.c
- block/blk-mq.h 1 addition, 0 deletionsblock/blk-mq.h
- block/blk-timeout.c 3 additions, 0 deletionsblock/blk-timeout.c
- drivers/block/null_blk.c 1 addition, 1 deletiondrivers/block/null_blk.c
- drivers/block/nvme-core.c 126 additions, 49 deletionsdrivers/block/nvme-core.c
- drivers/block/virtio_blk.c 1 addition, 1 deletiondrivers/block/virtio_blk.c
- include/linux/blk-mq.h 6 additions, 2 deletionsinclude/linux/blk-mq.h
- include/linux/blk_types.h 2 additions, 0 deletionsinclude/linux/blk_types.h
Loading
Please register or sign in to comment