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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]

Hi all,

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

  drivers/gpu/drm/i915/display/intel_dp_mst.c

between commit:

  66df9debcb29 ("drm/connector: make mode_valid_ctx take a const struct drm_display_mode")

from the drm-misc tree and commit:

  d49b485d1be3 ("drm/i915/dp_mst: Use intel_connector vs. drm_connector pointer in intel_dp_mst.c")

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/i915/display/intel_dp_mst.c
index aecaaf1d0fe2,2324ca8f6096..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -1422,8 -1454,8 +1454,8 @@@ static int mst_connector_get_modes(stru
  }
  
  static int
- mst_connector_mode_valid_ctx(struct drm_connector *connector,
+ mst_connector_mode_valid_ctx(struct drm_connector *_connector,
 -			     struct drm_display_mode *mode,
 +			     const struct drm_display_mode *mode,
  			     struct drm_modeset_acquire_ctx *ctx,
  			     enum drm_mode_status *status)
  {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]