diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-06-22 21:55:24 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-22 21:55:24 -0600 |
| commit | f95a0d6a95b12a79b7492da7ab687ae4cd741124 (patch) | |
| tree | 503ad30af40e94bbc090fc7de45a051030646141 /block/blk-mq-pci.c | |
| parent | a9590fe148c03cb4157b56255357419cb4e14124 (diff) | |
| parent | 8e8320c9315c47a6a090188720ccff32a6a6ba18 (diff) | |
| download | linux-f95a0d6a95b12a79b7492da7ab687ae4cd741124.tar.bz2 | |
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>
Diffstat (limited to 'block/blk-mq-pci.c')
0 files changed, 0 insertions, 0 deletions