]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a8f59d d4fd38b)
Merge commit 'd4fd38b3145b' 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)
commit2aa1cfce10213cc113357f5f259760015ebb9d83
tree503ad30af40e94bbc090fc7de45a051030646141tree | snapshot
parent6a8f59d92dd49025113d2ba453bfc945c2ea49b1commit | diff
parentd4fd38b3145be5f879e2ac7471cd4b6c06fecceacommit | diff
Merge commit 'd4fd38b3145b' 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.