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

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/i915/intel_dp.c

between commit:

  893da0c9bcb2 ("drm/i915: check for return value")

from the drm-intel tree and commit:

  13a3d91f17a5 ("drm: Pass 'name' to drm_encoder_init()")

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                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/i915/intel_dp.c
index ae4c21febbb5,9b10526cc6dd..000000000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -6009,9 -5976,8 +6009,9 @@@ intel_dp_init(struct drm_device *dev
  	intel_encoder = &intel_dig_port->base;
  	encoder = &intel_encoder->base;
  
 -	drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
 -			 DRM_MODE_ENCODER_TMDS, NULL);
 +	if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
- 			     DRM_MODE_ENCODER_TMDS))
++			     DRM_MODE_ENCODER_TMDS, NULL))
 +		goto err_encoder_init;
  
  	intel_encoder->compute_config = intel_dp_compute_config;
  	intel_encoder->disable = intel_disable_dp;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/