Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915:
Introduce a gmbus power domain") from the drm-intel-fixes tree and commit
69172f210e9fffaf8 ("drm/i915: take a power domain ref only when needed
during HDMI detect") from the drm tree.
I fixed it up (again resulting in a null diff) and can carry the fix as
necessary (no action is required).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL:
<http://lists.freedesktop.org/archives/dri-devel/attachments/20151203/862d4342/attachment.sig>
