linux-kernel - Re: linux-next: manual merge of the devicetree tree with Linus' 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: <09ef2b10-106a-43d4-9ab6-9c5039c0ded5@quicinc.com>
Date: Wed, 26 Feb 2025 10:41:55 +0800
From: Zijun Hu <quic_zijuhu@...cinc.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Rob Herring <robh@...nel.org>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next
 Mailing List <linux-next@...r.kernel.org>,
        Thomas Weißschuh
	<thomas.weissschuh@...utronix.de>
Subject: Re: linux-next: manual merge of the devicetree tree with Linus' tree

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.