summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2017-08-29 18:09:11 +0300
committerJens Axboe <axboe@kernel.dk>2017-08-29 18:09:11 +0300
commit2b76da95638010a70435f8455913133acc26e93f (patch)
tree51a42a4473f95212102380d2eced64e970a1576c /block
parentcd996fb47c360320cf25ac9503c16de085ea9cfc (diff)
parent1d5df6af8c7469f9ae3e66e7bed0782cfe4f95db (diff)
downloadlinux-2b76da95638010a70435f8455913133acc26e93f.tar.xz
Merge branch 'nvme-4.14' of git://git.infradead.org/nvme into for-4.14/block-postmerge
Pull NVMe changes from Christoph: "Below is the current set of NVMe updates for Linux 4.14, now against your postmerge branch, and with three more patches. The biggest bit comes from Sagi and refactors the RDMA driver to prepare for more code sharing in the setup and teardown path. But we have various features and bug fixes from a lot of people as well."
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions