Received-SPF: pass (google.com: domain of linux-kernel+bounces-57393-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 8 Feb 2024 13:38:55 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Andersson <andersson@kernel.org>, Mathieu Poirier
 <mathieu.poirier@linaro.org>, Ulf Hansson <ulf.hansson@linaro.org>
Cc: Andrew Davis <afd@ti.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the rpmsg tree with the pmdomain tree
Message-ID: <20240208133855.53695262@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ubV/oSdQ66uQ2x.P757eQ2V";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/ubV/oSdQ66uQ2x.P757eQ2V
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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;
 =20
  err_detach_domains:
 -	imx_dsp_detach_pm_domains(priv);
 +	dev_pm_domain_detach_list(priv->pd_list);
- err_put_rproc:
- 	rproc_free(rproc);
 =20
  	return ret;
  }
@@@ -1104,8 -1166,7 +1102,7 @@@ static void imx_dsp_rproc_remove(struc
 =20
  	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);
  }
 =20
  /* pm runtime functions */

--Sig_/ubV/oSdQ66uQ2x.P757eQ2V
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXEPr8ACgkQAVBC80lX
0GzGVggAljb63DY+kdUeutTRYrvB1UoW5K5Oy2D7AP9PPfw/wKew2/mK2N/45L4H
LYm8ljj/FaAnR9jGQBAut47IYHLTkT2OSVbpbM5rTtCSeroxQ/KElyQiBJHxpJPt
iGB8W9Bg0o0CZpBJ/kJxJVTB3vqMIOFoAYf7qRw9UpYOQDtg0mOlyJpl+wE5u/K5
qdmSaJg3gpTcOSzA7/u3rcStwBkAQz56Mj5+8FPKT+g8lTKphSAmI5XGy+WRzxfi
cX8Uq0XoByxV65AWahjPsuK18qxwXWJY17wrkQB8dydfEyRE0H2zwNbT9Su3Dqcr
B4NR7Z08OYgHLbwNWLkdckoWvQVF2w==
=Rm0Q
-----END PGP SIGNATURE-----

--Sig_/ubV/oSdQ66uQ2x.P757eQ2V--