| commit | 8aa6382907fa495e6b8b8184b53e36d142ffd8da | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@fb.com> | Fri May 26 09:11:19 2017 -0600 |
| committer | Jens Axboe <axboe@fb.com> | Fri May 26 09:11:19 2017 -0600 |
| tree | 16a22fc90548ee3edcb6e3ed1ffe4aa247bcadf2 | |
| parent | a8ecdd7117ee68fe27009acc8021423870c1dcd7 [diff] | |
| parent | 50af47d04ca530544b27affffb0722f158e2bb9c [diff] |
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."