From: Jens Axboe <axboe@fb.com>
Date: Fri, 26 May 2017 15:11:19 +0000 (-0600)
Subject: Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8aa6382907fa495e6b8b8184b53e36d142ffd8da;p=linux.git

Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus

Christoph writes:

"A couple of fixes for the next rc on the nvme front. Various FC fixes
from James, controller removal fixes from Ming (including a block layer
patch), a APST related device quirk from Andy, a RDMA fix for small
queue depth device from Marta, as well as fixes for the lack of
metadata support in non-PCIe drivers and the printk logging format from
me."
---

8aa6382907fa495e6b8b8184b53e36d142ffd8da