linux-next: manual merge of the drm tree with the origin tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/xe/xe_gt_idle.c between commit: 2470b141bfae2 ("drm/xe: move disable_c6 call") from the origin tree and commits: 6800e63cf97ba ("drm/xe: move disable_c6 call") 38e8c4184ea0e ("drm/xe: Enable Coarse Pow

linux-next: manual merge of the drm tree with the origin tree

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c between commit: c03d770c0b014 ("drm/amd/display: Attempt to avoid empty TUs when endpoint is DPIA") from the origin tree and commit: 0127f0445f7c1 ("drm/amd/displa