diff options
author | Jens Axboe <axboe@kernel.dk> | 2017-09-11 23:56:49 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-09-11 23:56:49 +0200 |
commit | be1c704329a51cbcf019f971c5d2023c0226d9cd (patch) | |
tree | eea96c1d9a6f0a86a3eee1f4cda07ab60c69914d /block/blk-mq.c | |
parent | mm/backing-dev.c: fix an error handling path in 'cgwb_create()' (diff) | |
parent | string.h: un-fortify memcpy_and_pad (diff) | |
download | linux-be1c704329a51cbcf019f971c5d2023c0226d9cd.tar.xz linux-be1c704329a51cbcf019f971c5d2023c0226d9cd.zip |
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)"
Diffstat (limited to 'block/blk-mq.c')
0 files changed, 0 insertions, 0 deletions