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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 23 May 2019 09:58:16 +1000

Hi all,

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

  include/drm/drm_mode_config.h

between commit:

  585b000de23b ("drm: move content protection property to mode_config")

from the drm-intel tree and commit:

  fbb5d0353c62 ("drm: Add HDR source metadata property")

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 include/drm/drm_mode_config.h
index 5764ee3c7453,c031b5a9d8d1..000000000000
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@@ -836,12 -836,13 +836,19 @@@ struct drm_mode_config 
  	 */
  	struct drm_property *writeback_out_fence_ptr_property;
  
 +	/**
 +	 * @content_protection_property: DRM ENUM property for content
 +	 * protection. See drm_connector_attach_content_protection_property().
 +	 */
 +	struct drm_property *content_protection_property;
 +
+ 	/**
+ 	 * hdr_output_metadata_property: Connector property containing hdr
+ 	 * metatda. This will be provided by userspace compositors based
+ 	 * on HDR content
+ 	 */
+ 	struct drm_property *hdr_output_metadata_property;
+ 
  	/* dumb ioctl parameters */
  	uint32_t preferred_depth, prefer_shadow;