diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-03 06:05:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-03 06:05:38 +0200 |
| commit | 0141af184adc7f6ea9bd2f9631a15704d0806f8b (patch) | |
| tree | b7b38bc150a0093f6cde1a33f290650403aa256e /fs/devpts | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-l... (diff) | |
| download | linux-0141af184adc7f6ea9bd2f9631a15704d0806f8b.tar.xz linux-0141af184adc7f6ea9bd2f9631a15704d0806f8b.zip | |
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 'fs/devpts')
0 files changed, 0 insertions, 0 deletions