linux-next: manual merge of the drm-misc tree with the drm tree

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/intel_display.h
index e20e6a36a748,809c06ae4c07..000000000000
--- a/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/intel_display.h
@@@ -25,22 -25,8 +25,24 @@@
  #ifndef _INTEL_DISPLAY_H_
  #define _INTEL_DISPLAY_H_
  
+ #include <drm/drm_util.h>
+ 
 +enum i915_gpio {
 +	GPIOA,
 +	GPIOB,
 +	GPIOC,
 +	GPIOD,
 +	GPIOE,
 +	GPIOF,
 +	GPIOG,
 +	GPIOH,
 +	__GPIOI_UNUSED,
 +	GPIOJ,
 +	GPIOK,
 +	GPIOL,
 +	GPIOM,
 +};
 +
  enum pipe {
  	INVALID_PIPE = -1,
  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20180912/33a3fbef/attachment.sig>