linux-next: manual merge of the drm tree with the tree
broonie at kernel.org
Thu Dec 3 06:41:47 PST 2015
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_runtime_pm.c between commit
ac9b8236551d11 ("drm/i915: Introduce a gmbus power domain") from the
drm-intel-fixes tree and commit 73dfc227ff5c8e005 ("drm/i915/skl: init/uninit
display core as part of the HW power domain state") from the drm tree. It
also seems like the gmbus power domain commit has been added in both trees.
I fixed it up (resulting in an empty diff) and can carry the fix as necessary
(no action is required).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 473 bytes
Desc: not available
More information about the dri-devel