From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 11 Sep 2017 21:56:49 +0000 (-0600)
Subject: Merge branch 'nvme-4.14' of git://git.infradead.org/nvme into for-linus
X-Git-Tag: v4.14-rc1~42^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be1c704329a51cbcf019f971c5d2023c0226d9cd;p=platform%2Fkernel%2Flinux-rpi3.git

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

Pull NVMe fixes from Christoph:

"Below are a few small fixes for the current merge window:

 - fix string.h compilation failures with the new memcpy_and_pad
   helper (Martin Wilck)
 - fix incorrect dereference of a PCI data structure in the lightnvm
   support code (me)
 - HMB fixes (Akinobu Mita and me)"
---

be1c704329a51cbcf019f971c5d2023c0226d9cd