linux-next: manual merge of the rpmsg tree with the pmdomain tree

[Stephen Rothwell]

Hi all,

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

  drivers/remoteproc/imx_dsp_rproc.c

between commit:

  ab2ce14d02c0 ("remoteproc: imx_dsp_rproc: Convert to dev_pm_domain_attach|detach_list()")

from the pmdomain tree and commit:

  8f12de7913af ("remoteproc: imx_dsp_rproc: Use devm_rproc_alloc() helper")

from the rpmsg 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/remoteproc/imx_dsp_rproc.c
index d73727a5828a,56a799cb8b36..000000000000
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@@ -1090,9 -1154,7 +1090,7 @@@ static int imx_dsp_rproc_probe(struct p
  	return 0;
  
  err_detach_domains:
 -	imx_dsp_detach_pm_domains(priv);
 +	dev_pm_domain_detach_list(priv->pd_list);
- err_put_rproc:
- 	rproc_free(rproc);
  
  	return ret;
  }
@@@ -1104,8 -1166,7 +1102,7 @@@ static void imx_dsp_rproc_remove(struc
  
  	pm_runtime_disable(&pdev->dev);
  	rproc_del(rproc);
 -	imx_dsp_detach_pm_domains(priv);
 +	dev_pm_domain_detach_list(priv->pd_list);
- 	rproc_free(rproc);
  }
  
  /* pm runtime functions */

Attachment: pgpSlwNbjDfA8.pgp
Description: OpenPGP digital signature