summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2017-06-08 08:33:45 -0600
committerJens Axboe <axboe@fb.com>2017-06-08 08:33:45 -0600
commit85d0331aedff4646b2a2b14561c8be3678ffcee2 (patch)
tree0ae7f21b848758bf809385c773529cbbe76c1fb4 /block
parent6460495709aeb651896bc8e5c134b2e4ca7d34a8 (diff)
parent9947d6a09cd71937dade2fc14640e4843ae19802 (diff)
downloadop-kernel-dev-85d0331aedff4646b2a2b14561c8be3678ffcee2.zip
op-kernel-dev-85d0331aedff4646b2a2b14561c8be3678ffcee2.tar.gz
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus
Christoph writes: "A few NVMe fixes for 4.12-rc, PCIe reset fixes and APST fixes, a RDMA reconnect fix, two FC fixes and a general controller removal fix."
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud