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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 3 Aug 2015 12:11:56 +1000

Hi all,

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

  drivers/gpu/drm/drm_atomic_helper.c

between commit:

  27667f4744fc ("i915: temporary fix for DP MST docking station NULL pointer dereference")

from Linus' tree and commit:

  fc596660dd4e ("drm/atomic: add connectors_changed to separate it from mode_changed, v2")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/gpu/drm/drm_atomic_helper.c
index 90065c226fe5,0b475fae067d..000000000000
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@@ -230,12 -230,10 +230,12 @@@ update_connector_routing(struct drm_ato
  	}
  
  	connector_state->best_encoder = new_encoder;
 -	idx = drm_crtc_index(connector_state->crtc);
 +	if (connector_state->crtc) {
 +		idx = drm_crtc_index(connector_state->crtc);
  
 -	crtc_state = state->crtc_states[idx];
 -	crtc_state->connectors_changed = true;
 +		crtc_state = state->crtc_states[idx];
- 		crtc_state->mode_changed = true;
++		crtc_state->connectors_changed = true;
 +	}
  
  	DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d]\n",
  			 connector->base.id,