| commit | ad15f74ac6c7ed1c7c252a760b017da042ec83fb | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed May 03 21:41:35 2017 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed May 03 21:41:35 2017 +0200 |
| tree | 0b8643ae709d8f413f9b58b544d65aeaf48a0c7a | |
| parent | 8a2d6ae1f737fd22eaeadd0dc32b85c92f239025 [diff] | |
| parent | 8b03d1ed2c43a2ba5ef3381322ee4515b97381bf [diff] |
Merge tag 'tags/drm-for-v4.12' into drm-intel-next-queued
Backmerge the main drm-next pull to sync up.
Chris also pointed out that
commit ade0b0c965f59176daddbef9c4717354034f9bce
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Apr 22 09:15:37 2017 +0100
drm/i915: Confirm the request is still active before adding it to the await
is double-applied in the git merge, so make sure we get this right.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>