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

[Stephen Rothwell]

Hi all,

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

  include/drm/drm_crtc.h

between commit:

  5c759eda9b04 ("drm: Introduce plane and CRTC scaling filter properties")

from the drm tree and commit:

  cb21f3f882ad ("drm/msm/atomic: Drop per-CRTC locks in reverse order")

from the drm-msm 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_crtc.h
index ba839e5e357d,cd42f79b2890..000000000000
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@@ -1279,7 -1266,14 +1279,17 @@@ static inline struct drm_crtc *drm_crtc
  #define drm_for_each_crtc(crtc, dev) \
  	list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head)
  
+ /**
+  * drm_for_each_crtc_reverse - iterate over all CRTCs in reverse order
+  * @crtc: a &struct drm_crtc as the loop cursor
+  * @dev: the &struct drm_device
+  *
+  * Iterate over all CRTCs of @dev.
+  */
+ #define drm_for_each_crtc_reverse(crtc, dev) \
+ 	list_for_each_entry_reverse(crtc, &(dev)->mode_config.crtc_list, head)
+ 
 +int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc,
 +					    unsigned int supported_filters);
 +
  #endif /* __DRM_CRTC_H__ */

Attachment: pgp9SXnyB7EWm.pgp
Description: OpenPGP digital signature