]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2626ac1) | patch
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)
commit49879b2d4d18cf978674b5fa9a13b1ddb9403d69
treedc0ceb325d4dcf3692164fba0c654f365a411989tree | snapshot
parent2626ac1ea4b311f84fc7707e788b5b74f1cd8332commit | diff
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 diff | blob | history
Linux Kernel Source Tree.