Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@fb.com>
Thu, 8 Jun 2017 14:33:45 +0000 (08:33 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 8 Jun 2017 14:33:45 +0000 (08:33 -0600)
commit85d0331aedff4646b2a2b14561c8be3678ffcee2
tree0ae7f21b848758bf809385c773529cbbe76c1fb4
parent6460495709aeb651896bc8e5c134b2e4ca7d34a8
parent9947d6a09cd71937dade2fc14640e4843ae19802
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."