From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 30 Aug 2017 15:10:09 +0000 (-0600)
Subject: Merge branch 'nvme-4.13' of git://git.infradead.org/nvme into for-linus
X-Git-Tag: v4.13~17^2
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=7ef10f3cddb56c65881301d6b4d39c475369be5d

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

Pull NVMe fixes from Christoph:

"Three more fixes for 4.13 below:

 - fix the incorrect bit for the doorbell buffer features (Changpeng Liu)
 - always use a 4k MR page size for RDMA, to not get in trouble with
   offset in non-4k page size systems (no-op for x86) (Max Gurtovoy)
 - and a fix for the new nvme host memory buffer support to keep the
   descriptor list DMA mapped when the buffer is enabled (me)"
---

7ef10f3cddb56c65881301d6b4d39c475369be5d