Skip to content
Snippets Groups Projects
Commit f112b68f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge v6.8-rc6 into drm-next


Thomas Zimmermann asked to backmerge -rc6 for drm-misc branches,
there's a few same-area-changed conflicts (xe and amdgpu mostly) that
are getting a bit too annoying.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents aa775edb d206a76d
No related branches found
No related tags found
No related merge requests found
Showing
with 115 additions and 68 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