| commit | 86634fa4e6aeff2e190616c304156899beb4d76b | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Jul 05 10:35:14 2024 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Jul 05 10:47:28 2024 +0200 |
| tree | d63fd0480e4ad11b9bdf6b653a63464429a63360 | |
| parent | 27aec396c48c6407a7586a35d79ac3fe387f2054 [diff] | |
| parent | 22a40d14b572deb80c0648557f4bd502d7e83826 [diff] |
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: Daniel Vetter <daniel.vetter@ffwll.ch>