Skip to content
Snippets Groups Projects
Commit d98c71da authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Merge drm-upstream/drm-next into drm-misc-next


We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>
parents d67b6a20 daf0678c
No related branches found
No related tags found
No related merge requests found
Showing
with 97 additions and 27 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