Merge tag 'v6.1.39' into 6.1/features/merge-fixes

Fix conflicts:

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/display/dc/core/dc_link.c
drivers/gpu/drm/amd/display/dc/dc_types.h
drivers/gpu/drm/i915/display/intel_tc.c
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>

0 files changed, 0 insertions, 0 deletions