]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ee3b16c 41e11c6)
Merge tag 'tags/drm-for-v4.12' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 May 2017 19:41:35 +0000 (21:41 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 May 2017 19:41:35 +0000 (21:41 +0200)
commitc31725e6d867f46e6c3f26f622a8e84c1e277850
tree0b8643ae709d8f413f9b58b544d65aeaf48a0c7atree | snapshot
parentee3b16ce4b788ad435fdcb027bf6bdc88a4e23accommit | diff
parent41e11c63777b6bc259e89b6b6ed563e95a977e52commit | 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 47e11eae8d158038f11f6036d7cdda2b296755d8
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>
drivers/gpu/drm/i915/gvt/scheduler.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.