linux-next: manual merge of the drm-intel tree with the drm-misc tree

2025-02-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp_mst.c between commit: 66df9debcb29 ("drm/connector: make mode_valid_ctx take a const struct drm_display_mode") from the drm-misc tree and commit: d49b485d1be3 ("drm/i915/dp_m

linux-next: manual merge of the drm-intel tree with the drm-misc tree

2024-12-17 Thread Stephen Rothwell
[Thanks, Imre for the heads up and help with the conflict resolution] Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp_mst.c between commit: 6fe7b1d10cbd ("drm/i915/dp_mst: Expose a connector to kernel users after it's properl