Hi all,

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

  drivers/gpu/drm/drm_probe_helper.c

between commit:

  12c683e12cd8 ("drm: bridge: Pass drm_display_info to drm_bridge_funcs .mode_valid()")

from the drm tree and commit:

  1c26b8e09004 ("drm/probe_helper: Add drm_connector_helper_funcs.mode_valid_ctx")

from the drm-intel 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/drm_probe_helper.c
index 09e872e61315,601a4f25bb47..000000000000
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@@ -114,10 -116,8 +116,10 @@@ drm_mode_validate_pipeline(struct drm_d
  		}
  
  		bridge = drm_bridge_chain_get_first_bridge(encoder);
- 		ret = drm_bridge_chain_mode_valid(bridge,
- 						  &connector->display_info,
- 						  mode);
- 		if (ret != MODE_OK) {
 -		*status = drm_bridge_chain_mode_valid(bridge, mode);
++		*status = drm_bridge_chain_mode_valid(bridge,
++						      &connector->display_info,
++						      mode);
+ 		if (*status != MODE_OK) {
  			/* There is also no point in continuing for crtc check
  			 * here. */
  			continue;