Hi all,

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

drivers/gpu/drm/i915/intel_display.h

between commit:

dce888798d3e ("drm/i915: remove confusing GPIO vs PCH_GPIO")

from the drm tree and commit:

d78aa650670d ("drm: Add drm/drm_util.h header file")

from the drm-misc tree.

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.