* linux-next: manual merge of the drm-intel tree with the kspp-gustavo tree
@ 2019-07-23 1:03 Stephen Rothwell
2019-07-29 0:31 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-07-23 1:03 UTC (permalink / raw)
To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI, Gustavo A. R. Silva
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Imre Deak
[-- Attachment #1: Type: text/plain, Size: 944 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp.c
between commit:
b6ac32eac063 ("drm/i915: Mark expected switch fall-throughs")
from the kspp-gustavo tree and commit:
bc85328ff431 ("drm/i915: Move the TypeC port handling code to a separate file")
4f36afb26cbe ("drm/i915: Sanitize the TypeC FIA lane configuration decoding")
from the drm-intel tree.
I fixed it up (bc85328ff431 moved the function updated by b6ac32eac063
and 4f36afb26cbe added an equivalt fixup) 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] 2+ messages in thread
* Re: linux-next: manual merge of the drm-intel tree with the kspp-gustavo tree
2019-07-23 1:03 linux-next: manual merge of the drm-intel tree with the kspp-gustavo tree Stephen Rothwell
@ 2019-07-29 0:31 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2019-07-29 0:31 UTC (permalink / raw)
To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI, Gustavo A. R. Silva
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Imre Deak
[-- Attachment #1: Type: text/plain, Size: 1185 bytes --]
Hi all,
On Tue, 23 Jul 2019 11:03:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_dp.c
>
> between commit:
>
> b6ac32eac063 ("drm/i915: Mark expected switch fall-throughs")
This is now commit
2defb94edb44 (""drm/i915: Mark expected switch fall-throughs")
from Linus' tree.
> from the kspp-gustavo tree and commit:
>
> bc85328ff431 ("drm/i915: Move the TypeC port handling code to a separate file")
> 4f36afb26cbe ("drm/i915: Sanitize the TypeC FIA lane configuration decoding")
>
> from the drm-intel tree.
>
> I fixed it up (bc85328ff431 moved the function updated by b6ac32eac063
> and 4f36afb26cbe added an equivalent fixup) 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] 2+ messages in thread
end of thread, other threads:[~2019-07-29 0:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-23 1:03 linux-next: manual merge of the drm-intel tree with the kspp-gustavo tree Stephen Rothwell
2019-07-29 0:31 ` 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).