* linux-next: manual merge of the tip tree with the drm-misc tree
@ 2020-05-19 6:16 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-05-19 6:16 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Daniel Vetter, Intel Graphics
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chris Wilson,
Dave Airlie, DRI, Paul E. McKenney
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/drm_dp_mst_topology.c
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-05-19 6:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-19 6:16 linux-next: manual merge of the tip tree with the drm-misc tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).