diff mbox series

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

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

Commit Message

Stephen Rothwell Aug. 29, 2024, 12:49 a.m. UTC
Hi all,

Today's linux-next merge of the drm tree got conflicts in:

  drivers/gpu/drm/i915/display/intel_dp_mst.c
  drivers/gpu/drm/i915/display/intel_dp_mst.h

between commit:

  a2ccc33b88e2 ("drm/i915/dp_mst: Fix MST state after a sink reset")

from the drm-intel-fixes tree and commit:

  e44bc451aa4b ("drm/i915/dp_mst: Ensure link parameters are up-to-date for a disabled link")

from the drm 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/i915/display/intel_dp_mst.c
index 17978a1f9ab0,45d2230d1801..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.h
index 9e4c7679f1c3,fba76454fa67..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.h