diff options
author | Jens Axboe <axboe@fb.com> | 2016-09-13 07:58:34 -0600 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-09-13 07:58:34 -0600 |
commit | 3bc42f3f0ef13a8239138a4c00a0b782f029f23d (patch) | |
tree | d098779bb062ee740158ed4b41065172ef4aa81b /drivers/infiniband/hw/cxgb4/t4.h | |
parent | nvme/quirk: Add a delay before checking device ready for memblaze device (diff) | |
parent | nvme-rdma: add back dependency on CONFIG_BLOCK (diff) | |
download | linux-dev-3bc42f3f0ef13a8239138a4c00a0b782f029f23d.tar.xz linux-dev-3bc42f3f0ef13a8239138a4c00a0b782f029f23d.zip |
Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus
Sagi writes:
Here we have:
- Kconfig dependencies fix from Arnd
- nvme-rdma device removal fixes from Steve
- possible bad deref fix from Colin
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/t4.h')
0 files changed, 0 insertions, 0 deletions