linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Mark Brown
2017-10-12T18:36:32Z

[-- Attachment #1.1: Type: text/plain, Size: 807 bytes --]

Hi all,

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

drivers/gpu/drm/i915/intel_display.c

between commit:

7b50f7b24cd6c ("rm/i915: Read timings from the correct transcoder in intel_crtc_mode_get()")

from the drm-intel-fixes tree and commit:

de330815677d8 ("drm/i915: Reuse normal state readout for LVDS/DVO fixed mode")

from the drm-intel tree.

I fixed it up by taking the version from the drm-intel tree 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.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org