projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27aec39 22a40d1)
Merge v6.10-rc6 into drm-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 5 Jul 2024 08:35:14 +0000 (10:35 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 5 Jul 2024 08:47:28 +0000 (10:47 +0200)
commit86634fa4e6aeff2e190616c304156899beb4d76b
treed63fd0480e4ad11b9bdf6b653a63464429a63360tree | snapshot
parent27aec396c48c6407a7586a35d79ac3fe387f2054commit | diff
parent22a40d14b572deb80c0648557f4bd502d7e83826commit | 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>
19 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/gpu/drm/Kconfig diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/Kconfig diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h diff1 | diff2 | blob | history
drivers/gpu/drm/bridge/panel.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_fb_helper.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_fbdev_dma.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_panel_orientation_quirks.c diff1 | diff2 | blob | history
drivers/gpu/drm/exynos/exynos_dp.c diff1 | diff2 | blob | history
drivers/gpu/drm/mediatek/mtk_drm_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/dispnv50/disp.c diff1 | diff2 | blob | history
drivers/gpu/drm/panel/panel-simple.c diff1 | diff2 | blob | history
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository