diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2017-08-29 09:09:11 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-08-29 09:09:11 -0600 |
| commit | 2b76da95638010a70435f8455913133acc26e93f (patch) | |
| tree | 51a42a4473f95212102380d2eced64e970a1576c /block/bfq-iosched.h | |
| parent | Merge tag 'v4.13-rc7' into for-4.14/block-postmerge (diff) | |
| parent | nvme: don't blindly overwrite identifiers on disk revalidate (diff) | |
| download | linux-dev-2b76da95638010a70435f8455913133acc26e93f.tar.xz linux-dev-2b76da95638010a70435f8455913133acc26e93f.zip | |
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/bfq-iosched.h')
0 files changed, 0 insertions, 0 deletions