linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20250226130718.0a652b44@canb.auug.org.au>
Date: Wed, 26 Feb 2025 13:07:18 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: 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>, Zijun Hu
 <quic_zijuhu@...cinc.com>
Subject: linux-next: manual merge of the devicetree tree with Linus' tree

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/of/of_private.h
index 1bdc7ceef3c5,b0c077867bf4..000000000000
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@@ -208,8 -208,11 +208,15 @@@ static void __maybe_unused of_dump_addr
  static void __maybe_unused of_dump_addr(const char *s, const __be32 *addr, int na) { }
  #endif
  
 +#if IS_ENABLED(CONFIG_KUNIT)
 +int __of_address_resource_bounds(struct resource *r, u64 start, u64 size);
 +#endif
 +
+ static inline bool is_pseudo_property(const char *prop_name)
+ {
+ 	return !of_prop_cmp(prop_name, "name") ||
+ 		!of_prop_cmp(prop_name, "phandle") ||
+ 		!of_prop_cmp(prop_name, "linux,phandle");
+ }
+ 
  #endif /* _LINUX_OF_PRIVATE_H */

Content of type "application/pgp-signature" skipped