diff options
| author | Jens Axboe <axboe@fb.com> | 2016-12-06 08:06:19 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-12-06 08:06:19 -0700 |
| commit | d65cfe9094ba66b8a3c7b80823ba9229759b119d (patch) | |
| tree | 62d54ca13d8c997934cf37f5698f0793b013c4d1 /drivers/block/nbd.c | |
| parent | 6e85eaf3078bcc8552ca32a0938dbf7d2b495af0 (diff) | |
| parent | 475d0fe795516a9b9f286a851c3972fd8831c643 (diff) | |
Merge branch 'nvmf-4.10' of git://git.infradead.org/nvme-fabrics into for-4.10/block
Sagi writes:
The major addition here is the nvme FC transport implementation
from James.
What else:
- some cleanups and memory leak fixes in the host side fabrics code from Bart
- possible rcu violation fix from Sasha
- logging change from Max
- small include cleanup
Diffstat (limited to 'drivers/block/nbd.c')
0 files changed, 0 insertions, 0 deletions