diff mbox series

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

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

Commit Message

Stephen Rothwell Dec. 16, 2019, 12:46 a.m. UTC
Hi all,

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


between commit:

  14692a3637d4 ("drm/dp_mst: Add probe_lock")
  3f9b3f02dda5 ("drm/dp_mst: Protect drm_dp_mst_port members with locking")
  6f85f73821f6 ("drm/dp_mst: Add basic topology reprobing when resuming")

from Linus' tree and commits:

  f79489074c59 ("drm/dp_mst: Clear all payload id tables downstream when initializing")

from the drm-misc 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


diff --cc drivers/gpu/drm/drm_dp_mst_topology.c
index 273dd80fabf3,1770754bcd4a..000000000000
--- a/drivers/gpu/drm/drm_dp_mst_topology.c