Re: linux-next: manual merge of the devicetree tree with Linus' tree

Zijun Hu
2025-02-26T02:42:22Z

On 2/26/2025 10:07 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> drivers/of/of_private.h
>
> between commit:
>
> e6649328dc07 ("of: address: Add kunit test for __of_address_resource_bounds()")
>
> from Linus' tree and commit:
>
> f443029c9a6e ("of: Introduce and apply private is_pseudo_property()")
>
> from the devicetree 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.
>

thank you @Stephen, LGTM for the fix.