| commit | 8f66439eec46d652255b9351abebb540ee5b2fd9 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Mon Jun 12 08:30:13 2017 -0600 |
| committer | Jens Axboe <axboe@kernel.dk> | Mon Jun 12 08:30:13 2017 -0600 |
| tree | 94f4a41dc343cf769cd92f1f7711e9ce8ad43728 | |
| parent | 22ec656bcc3f38207ad5476ebad1e5005fb0f1ff [diff] | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 [diff] |
Merge tag 'v4.12-rc5' into for-4.13/block We've already got a few conflicts and upcoming work depends on some of the changes that have gone into mainline as regression fixes for this series. Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream trees to continue working on 4.13 changes. Signed-off-by: Jens Axboe <axboe@kernel.dk>