]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
nvme-rdma: fix merge error
authorChristoph Hellwig <hch@lst.de>
Mon, 12 Jun 2017 16:26:06 +0000 (18:26 +0200)
committerJens Axboe <axboe@fb.com>
Mon, 12 Jun 2017 16:43:12 +0000 (10:43 -0600)
commita104c9f22c7d073d4ae308ca36383ce5cc4631cc
treedc0ceb325d4dcf3692164fba0c654f365a411989
parent8f66439eec46d652255b9351abebb540ee5b2fd9
nvme-rdma: fix merge error

The merge of 4.12-rc5 into the for-4.13/block tree didn't handle the queue
ready case correctly.  Fix this by propagating blk_status_t into
nvme_rdma_queue_is_ready.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/nvme/host/rdma.c