]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
projects / thirdparty / kernel / stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a9590fe 8e8320c)
Merge commit '8e8320c9315c' into for-4.13/block
authorJens Axboe <axboe@kernel.dk>
Fri, 23 Jun 2017 03:55:24 +0000 (21:55 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 23 Jun 2017 03:55:24 +0000 (21:55 -0600)
commitf95a0d6a95b12a79b7492da7ab687ae4cd741124
tree503ad30af40e94bbc090fc7de45a051030646141tree | snapshot
parenta9590fe148c03cb4157b56255357419cb4e14124commit | diff
parent8e8320c9315c47a6a090188720ccff32a6a6ba18commit | diff
Merge commit '8e8320c9315c' into for-4.13/block

Pull in the fix for shared tags, as it conflicts with the pending
changes in for-4.13/block. We already pulled in v4.12-rc5 to solve
other conflicts or get fixes that went into 4.12, so not a lot
of changes in this merge.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq-sched.c diff1 | diff2 | blob | history
block/blk-mq-sched.h diff1 | diff2 | blob | history
block/blk-mq.c diff1 | diff2 | blob | history
drivers/block/xen-blkback/blkback.c diff1 | diff2 | blob | history
include/linux/blkdev.h diff1 | diff2 | blob | history
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git