Re: linux-next: manual merge of the pmdomain tree with the xilinx tree

[Michal Simek]

Hi Stephen and Ulf,

po 21. 7. 2025 v 4:38 odesílatel Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> napsal:
>
> Hi all,
>
> Today's linux-next merge of the pmdomain tree got a conflict in:
>
>   drivers/firmware/xilinx/zynqmp.c
>
> between commit:
>
>   ef32394c6d34 ("drivers: firmware: xilinx: Add unique family code for all platforms")
>
> from the xilinx tree and commits:
>
>   3da405ead651 ("firmware/pmdomain: xilinx: Move ->sync_state() support to firmware driver")
>   29ea33866d6d ("firmware: xilinx: Use of_genpd_sync_state()")
>
> from the pmdomain 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.

Thanks.

Ulf: change in your tree should come first and I will deal with the
fix via my tree.

Thanks,
MIchal