Subject: linux-next: manual merge of the drm-intel tree with the kspp-gustavo tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 23 Jul 2019 11:03:31 +1000

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