projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 58ab5e3 40e020c)
Merge tag 'v4.20-rc6' into for-4.21/block
authorJens Axboe <axboe@kernel.dk>
Mon, 10 Dec 2018 00:45:40 +0000 (17:45 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 10 Dec 2018 00:45:40 +0000 (17:45 -0700)
commit96f774106ed48808a5e314741e3414c617d14460
treea0beee162eeaf4813495ee28d3cfdd06effbc8betree | snapshot
parent58ab5e32e6fd83e33943614e7257f2ac5823824acommit | diff
parent40e020c129cfc991e8ab4736d2665351ffd1468dcommit | diff
Merge tag 'v4.20-rc6' into for-4.21/block

Pull in v4.20-rc6 to resolve the conflict in NVMe, but also to get the
two corruption fixes. We're going to be overhauling the direct dispatch
path, and we need to do that on top of the changes we made for that
in mainline.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bfq-iosched.c diff1 | diff2 | blob | history
block/blk-mq.c diff1 | diff2 | blob | history
drivers/nvme/host/core.c diff1 | diff2 | blob | history
drivers/nvme/target/rdma.c diff1 | diff2 | blob | history
fs/iomap.c diff1 | diff2 | blob | history
Domain: System / Kernel;