]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f502279 b82d402)
Merge commit 'b82d402f60c6' 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)
commit9f527d0147e37efe50b7a0e5eee5197a73582268
tree503ad30af40e94bbc090fc7de45a051030646141tree | snapshot
parentf502279fa2c848e94e138f4cb0bfb5ebf813fea8commit | diff
parentb82d402f60c6b8bde438d5b4efdb17e89e68d7a9commit | diff
Merge commit 'b82d402f60c6' 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
Linux Kernel Source Tree.