Skip to content
Commit 86634fa4 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge v6.10-rc6 into drm-next



The exynos-next pull is based on a newer -rc than drm-next. hence
backmerge first to make sure the unrelated conflicts we accumulated
don't end up randomly in the exynos merge pull, but are separated out.

Conflicts are all benign: Adjacent changes in amdgpu and fbdev-dma
code, and cherry-pick conflict in xe.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 27aec396 22a40d14
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment