tree 94f4a41dc343cf769cd92f1f7711e9ce8ad43728
parent 22ec656bcc3f38207ad5476ebad1e5005fb0f1ff
parent 32c1431eea4881a6b17bd7c639315010aeefa452
author Jens Axboe <axboe@kernel.dk> 1497277813 -0600
committer Jens Axboe <axboe@kernel.dk> 1497277813 -0600
mergetag object 32c1431eea4881a6b17bd7c639315010aeefa452
 type commit
 tag v4.12-rc5
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1497224907 -0700
 
 Linux 4.12-rc5
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJZPdbLAAoJEHm+PkMAQRiGx4wH/1nCjfnl6fE8oJ24/1gEAOUh
 biFdqJkYZmlLYHVtYfLm4Ueg4adJdg0wx6qM/4RaAzmQVvLfDV34bc1qBf1+P95G
 kVF+osWyXrZo5cTwkwapHW/KNu4VJwAx2D1wrlxKDVG5AOrULH1pYOYGOpApEkZU
 4N+q5+M0ce0GJpqtUZX+UnI33ygjdDbBxXoFKsr24B7eA0ouGbAJ7dC88WcaETL+
 2/7tT01SvDMo0jBSV0WIqlgXwZ5gp3yPGnklC3F4159Yze6VFrzHMKS/UpPF8o8E
 W9EbuzwxsKyXUifX2GY348L1f+47glen/1sedbuKnFhP6E9aqUQQJXvEO7ueQl4=
 =m2Gx
 -----END PGP SIGNATURE-----

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>