diff options
| author | Jens Axboe <axboe@fb.com> | 2017-06-08 08:33:45 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-06-08 08:33:45 -0600 |
| commit | 85d0331aedff4646b2a2b14561c8be3678ffcee2 (patch) | |
| tree | 0ae7f21b848758bf809385c773529cbbe76c1fb4 /block/bfq-iosched.h | |
| parent | 6460495709aeb651896bc8e5c134b2e4ca7d34a8 (diff) | |
| parent | 9947d6a09cd71937dade2fc14640e4843ae19802 (diff) | |
| download | linux-85d0331aedff4646b2a2b14561c8be3678ffcee2.tar.bz2 | |
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus
Christoph writes:
"A few NVMe fixes for 4.12-rc, PCIe reset fixes and APST fixes, a
RDMA reconnect fix, two FC fixes and a general controller removal fix."
Diffstat (limited to 'block/bfq-iosched.h')
0 files changed, 0 insertions, 0 deletions