tree 0ae7f21b848758bf809385c773529cbbe76c1fb4
parent 6460495709aeb651896bc8e5c134b2e4ca7d34a8
parent 9947d6a09cd71937dade2fc14640e4843ae19802
author Jens Axboe <axboe@fb.com> 1496932425 -0600
committer Jens Axboe <axboe@fb.com> 1496932425 -0600

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."