diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-02 21:05:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-02 21:05:38 -0700 |
commit | 0141af184adc7f6ea9bd2f9631a15704d0806f8b (patch) | |
tree | b7b38bc150a0093f6cde1a33f290650403aa256e /drivers/nvme/host/Kconfig | |
parent | 0ddc9e5a112489e1703143ad75b44fc57f9ac25a (diff) | |
parent | d8d8d9d789097f91edaeee65b77523079fa8cf3f (diff) | |
download | linux-0141af184adc7f6ea9bd2f9631a15704d0806f8b.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A collection of fixes for the nvme over fabrics code"
* 'for-linus' of git://git.kernel.dk/linux-block:
nvme-rdma: Get rid of redundant defines
nvme-rdma: Get rid of duplicate variable
nvme: fabrics drivers don't need the nvme-pci driver
nvme-fabrics: get a reference when reusing a nvme_host structure
nvme-fabrics: change NQN UUID to big-endian format
nvme-loop: set sqsize to 0-based value, per spec
nvme-rdma: fix sqsize/hsqsize per spec
fabrics: define admin sqsize min default, per spec
nvmet-rdma: +1 to *queue_size from hsqsize/hrqsize
nvmet-rdma: Fix use after free
nvme-rdma: initialize ret to zero to avoid returning garbage
Diffstat (limited to 'drivers/nvme/host/Kconfig')
-rw-r--r-- | drivers/nvme/host/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig index db39d53cdfb9..0c644f7bdf80 100644 --- a/drivers/nvme/host/Kconfig +++ b/drivers/nvme/host/Kconfig @@ -31,7 +31,7 @@ config NVME_FABRICS config NVME_RDMA tristate "NVM Express over Fabrics RDMA host driver" depends on INFINIBAND - depends on BLK_DEV_NVME + select NVME_CORE select NVME_FABRICS select SG_POOL help |