]> git.ipfire.org Git - people/arne_f/kernel.git/commit
projects / people / arne_f / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b045bd 1359798)
Merge branch 'nvme-4.14' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@kernel.dk>
Mon, 11 Sep 2017 21:56:49 +0000 (15:56 -0600)
committerJens Axboe <axboe@kernel.dk>
Mon, 11 Sep 2017 21:56:49 +0000 (15:56 -0600)
commitbe1c704329a51cbcf019f971c5d2023c0226d9cd
treeeea96c1d9a6f0a86a3eee1f4cda07ab60c69914dtree | snapshot
parent0b045bd1c1c2819b33f4522e3efa4666d1ecf1a4commit | diff
parent1359798f9d4082eb04575efdd19512fbd9c28464commit | diff
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)"
Arne's tree of linux kernel.