linux-next: manual merge of the drm tree with Linus' tree

Mark Brown
2017-10-30T18:36:15Z

[-- Attachment #1: Type: text/plain, Size: 1154 bytes --]

Hi Dave,

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

drivers/gpu/drm/i915/intel_runtime_pm.c

between commit:

2a8408e537250 ("drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume")

from Linus' tree and commit:

57522c4c87de2 ("drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume")

from the drm tree. This one has also been in Linus' tree since -rc6.

I fixed it up (see below) 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.

diff --cc drivers/gpu/drm/i915/intel_display.c
index 5c7828c52d12,7e91dc9a0fcf..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c
index 49577eba8e7e,8af286c63d3b..000000000000
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c

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