Skip to content
Snippets Groups Projects
Commit f9bf1d97 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued


Backmerge because Chris Wilson needs the very latest&greates of
Gustavo Padovan's sync_file work, specifically the refcounting changes
from:

commit 30cd85dd
Author: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date:   Wed Oct 19 15:48:32 2016 -0200

    dma-buf/sync_file: hold reference to fence when creating sync_file

Also good to sync in general since git tends to get confused with the
cherry-picking going on.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 0fc6a9dc 5481e27f
No related branches found
No related tags found
No related merge requests found
Showing
with 1032 additions and 48 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment