[Intel-gfx] linux-next: manual merge of the tip tree with the drm-misc tree

Stephen Rothwell sfr at canb.auug.org.au
Tue May 19 06:16:47 UTC 2020

Hi all,

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


between commit:

  a4292e52106b ("drm: Match drm_dp_send_clear_payload_id_table definition to declaration")

from the drm-misc tree and commit:

  53965dbe5396 ("drm: Make drm_dp_mst_dsc_aux_for_port() safe for old compilers")

from the tip tree.

I fixed it up (I used the former) 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.

Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20200519/ef91d873/attachment.sig>

More information about the Intel-gfx mailing list