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

Message ID 20240208133855.53695262@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the rpmsg tree with the pmdomain tree |

Commit Message

Stephen Rothwell Feb. 8, 2024, 2:38 a.m. UTC
  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.
  

Patch

diff --cc drivers/remoteproc/imx_dsp_rproc.c
index d73727a5828a,56a799cb8b36..000000000000
--- a/drivers/remoteproc/imx_dsp_rproc.c