diff mbox series

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

Message ID 20241014142439.40e63852@canb.auug.org.au (mailing list archive)
State New
Headers show
Series linux-next: manual merge of the drm-xe tree with the drm-intel tree | expand

Commit Message

Stephen Rothwell Oct. 14, 2024, 3:24 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:

  5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display")

from the drm-intel tree and commit:

  a4de6beb83fc ("drm/xe/display: Separate the d3cold and non-d3cold runtime PM handling")

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.
diff mbox series

Patch

diff --cc drivers/gpu/drm/xe/display/xe_display.c
index 957ae763531d,5c6b74c36b60..000000000000
--- a/drivers/gpu/drm/xe/display/xe_display.c