From: Jens Axboe <axboe@fb.com>
Date: Thu, 8 Jun 2017 14:33:45 +0000 (-0600)
Subject: Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus
X-Git-Tag: v4.12-rc5~23^2~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=85d0331aedff4646b2a2b14561c8be3678ffcee2;p=karo-tx-linux.git

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

85d0331aedff4646b2a2b14561c8be3678ffcee2