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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAHTX3dLHcQe3aZ8aSyJO7KuidbFzB5Jcb_=EcEZL5D5=btKw+Q@mail.gmail.com>
Date: Mon, 21 Jul 2025 08:16:09 +0200
From: Michal Simek <monstr@...str.eu>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Ulf Hansson <ulf.hansson@...aro.org>, Jay Buddhabhatti <jay.buddhabhatti@....com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Michal Simek <michal.simek@....com>
Subject: Re: linux-next: manual merge of the pmdomain tree with the xilinx tree

Hi Stephen and Ulf,

po 21. 7. 2025 v 4:38 odesílatel Stephen Rothwell <sfr@...b.auug.org.au> 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