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

Commit Message

Stephen Rothwell Feb. 26, 2025, 1:12 a.m. UTC

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  drivers/gpu/drm/xe/display/xe_display.c

between commit:

  1b242ceec536 ("drm/i915/audio: convert to struct intel_display")

from the drm-intel tree and commit:

  d41d048043c4 ("drm/xe/display: Drop xe_display_driver_remove()")

from the drm-xe tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Patch

diff --cc drivers/gpu/drm/xe/display/xe_display.c
index 96ba9595bf2a,279b786d64dc..000000000000
--- a/drivers/gpu/drm/xe/display/xe_display.c