tree eea96c1d9a6f0a86a3eee1f4cda07ab60c69914d
parent 0b045bd1c1c2819b33f4522e3efa4666d1ecf1a4
parent 1359798f9d4082eb04575efdd19512fbd9c28464
author Jens Axboe <axboe@kernel.dk> 1505167009 -0600
committer Jens Axboe <axboe@kernel.dk> 1505167009 -0600

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