Received-SPF: pass (google.com: domain of linux-kernel+bounces-109524-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Thu, 21 Mar 2024 11:45:35 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Andersson <andersson@kernel.org>, Mathieu Poirier
 <mathieu.poirier@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>, Ulf Hansson <ulf.hansson@linaro.org>
Subject: linux-next: manual merge of the rpmsg tree with Linus' tree
Message-ID: <20240321114535.1aa208bc@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/dsIAHX_t4DSI885GW9zS5pZ";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/dsIAHX_t4DSI885GW9zS5pZ
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/qcom_q6v5_adsp.c

between commit:

  db34c47d56d5 ("remoteproc: qcom_q6v5_adsp: Convert to dev_pm_domain_attac=
h|detach_list()")

from Linus' tree and commit:

  5789e877b93b ("remoteproc: qcom_q6v5_adsp: 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/qcom_q6v5_adsp.c
index 93f9a1537ec6,34ac996a93b2..000000000000
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@@ -704,13 -713,15 +704,13 @@@ static int adsp_probe(struct platform_d
 =20
  	ret =3D adsp_init_clock(adsp, desc->clk_ids);
  	if (ret)
- 		goto free_rproc;
+ 		return ret;
 =20
 -	ret =3D qcom_rproc_pds_attach(adsp->dev, adsp,
 -				    desc->proxy_pd_names);
 +	ret =3D qcom_rproc_pds_attach(adsp, desc->pd_names, desc->num_pds);
  	if (ret < 0) {
  		dev_err(&pdev->dev, "Failed to attach proxy power domains\n");
- 		goto free_rproc;
+ 		return ret;
  	}
 -	adsp->proxy_pd_count =3D ret;
 =20
  	ret =3D adsp_init_reset(adsp);
  	if (ret)
@@@ -742,11 -753,8 +742,8 @@@
  	return 0;
 =20
  disable_pm:
 -	qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
 +	qcom_rproc_pds_detach(adsp);
 =20
- free_rproc:
- 	rproc_free(rproc);
-=20
  	return ret;
  }
 =20
@@@ -760,8 -768,7 +757,7 @@@ static void adsp_remove(struct platform
  	qcom_remove_glink_subdev(adsp->rproc, &adsp->glink_subdev);
  	qcom_remove_sysmon_subdev(adsp->sysmon);
  	qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev);
 -	qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
 +	qcom_rproc_pds_detach(adsp);
- 	rproc_free(adsp->rproc);
  }
 =20
  static const struct adsp_pil_data adsp_resource_init =3D {

--Sig_/dsIAHX_t4DSI885GW9zS5pZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmX7gy8ACgkQAVBC80lX
0GzT2Af8CJUuuarfXO1M5NAAd0F/Mv8XiaGmHzEWK9eT/xfGXXFYP1HVSD31Yvb6
/24wtiCutC8GZBjj3ZWtqU5bVF2tb3ksijQLD+2+WQGID3Vm0KpURDSihSxFDMH8
3YAxJFcFVYyEYa7VLhC+xcFCHgmRPvYcgOSPdUMP+nUuGCOVoQAvuNmo/Fn2rj7U
toU+E7qHtga9x25UvvN86Tx0cPdlcMN3vX9YJPC2xVJzbQ67mEUSt2Fvg0MssKFr
DPN9vBPE7fJTQkHpxhX+PQi4pQKKBs2A104M5tL63HInu8Gas3BM8QY7GTZFBmj2
LadIDzynkHFPmNqVTGWQywdiRwf4tQ==
=5aFe
-----END PGP SIGNATURE-----

--Sig_/dsIAHX_t4DSI885GW9zS5pZ--