linux-next: manual merge of the tip tree with the drm-msm tree

linux-next: manual merge of the tip tree with the drm-msm tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/msm/msm_drv.c

between commit:

  00be2abf1413 ("drm/msm: use kthread_create_worker instead of kthread_run")

from the drm-msm tree and commits:

  64419ca67622 ("sched,msm: Convert to sched_set_fifo*()")
  8b700983de82 ("sched: Remove sched_set_*() return value")

from the tip 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/msm/msm_drv.c
index 36d98d4116ca,556cca38487c..000000000000
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@@ -524,11 -508,8 +517,7 @@@ static int msm_drm_init(struct device *
  			goto err_msm_uninit;
  		}
  
- 		ret = sched_setscheduler(priv->event_thread[i].worker->task,
- 					 SCHED_FIFO, &param);
- 		if (ret)
- 			dev_warn(dev, "event_thread set priority failed:%d\n",
- 				 ret);
 -		sched_set_fifo(priv->event_thread[i].thread);
++		sched_set_fifo(priv->event_thread[i].worker->task);
  	}
  
  	ret = drm_vblank_init(ddev, priv->num_crtcs);

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