diff options
| author | Jens Axboe <axboe@fb.com> | 2017-05-26 18:11:19 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-05-26 18:11:19 +0300 |
| commit | 8aa6382907fa495e6b8b8184b53e36d142ffd8da (patch) | |
| tree | 16a22fc90548ee3edcb6e3ed1ffe4aa247bcadf2 /include | |
| parent | a8ecdd7117ee68fe27009acc8021423870c1dcd7 (diff) | |
| parent | 50af47d04ca530544b27affffb0722f158e2bb9c (diff) | |
| download | linux-8aa6382907fa495e6b8b8184b53e36d142ffd8da.tar.xz | |
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus
Christoph writes:
"A couple of fixes for the next rc on the nvme front. Various FC fixes
from James, controller removal fixes from Ming (including a block layer
patch), a APST related device quirk from Andy, a RDMA fix for small
queue depth device from Marta, as well as fixes for the lack of
metadata support in non-PCIe drivers and the printk logging format from
me."
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blk-mq.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index c47aa248c640..fcd641032f8d 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -238,7 +238,6 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head, bool kick_requeue_list); void blk_mq_kick_requeue_list(struct request_queue *q); void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs); -void blk_mq_abort_requeue_list(struct request_queue *q); void blk_mq_complete_request(struct request *rq); bool blk_mq_queue_stopped(struct request_queue *q); |