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

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/nouveau/dispnv50/disp.c

between commit:

  d6c6a76f80a1 ("drm: Update MST First Link Slot Information Based on Encoding Format")

from Linus' tree and commit:

  606be062c2e5 ("drm/nouveau/kms/nv50-: Remove several set but not used variables "ret" in disp.c")

from the drm-misc 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/nouveau/dispnv50/disp.c
index 8e28403ea9b1,23fa9ecc2296..000000000000
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@@ -1411,10 -1413,9 +1413,9 @@@ nv50_mstm_prepare(struct nv50_mstm *mst
  {
  	struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev);
  	struct drm_encoder *encoder;
- 	int ret;
  
  	NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name);
- 	ret = drm_dp_update_payload_part1(&mstm->mgr, 1);
 -	drm_dp_update_payload_part1(&mstm->mgr);
++	drm_dp_update_payload_part1(&mstm->mgr, 1);
  
  	drm_for_each_encoder(encoder, mstm->outp->base.base.dev) {
  		if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {

Attachment: pgpNVjS9b78No.pgp
Description: OpenPGP digital signature