linux-next: manual merge of the drm-msm-lumag tree with Linus', drm-msm trees

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

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

Hi all,

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

  drivers/gpu/drm/msm/msm_drv.c

between commits:

  d73b1d02de08 ("drm/msm: Hangcheck progress detection")
  8636500300a0 ("drm/msm: Fix failure paths in msm_drm_init()")

from Linus', drm-msm trees and commit:

  643b7d0869cc ("drm/msm: Add missing check and destroy for alloc_ordered_workqueue")

from the drm-msm-lumag 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 0509e90d05e3,b052327181b2..000000000000
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@@ -420,7 -418,11 +420,9 @@@ static int msm_drm_init(struct device *
  	priv->dev = ddev;
  
  	priv->wq = alloc_ordered_workqueue("msm", 0);
+ 	if (!priv->wq)
+ 		return -ENOMEM;
  
 -	priv->hangcheck_period = DRM_MSM_HANGCHECK_DEFAULT_PERIOD;
 -
  	INIT_LIST_HEAD(&priv->objects);
  	mutex_init(&priv->obj_lock);
  

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