Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git

# Conflicts:
#	drivers/of/of_private.h

diff --cc Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
index fc8e82cb28a93a9d62c6e1c4ec8d8b97dc464e2a,ba325c514b409c4e47af22372f0f7af39e5265f2..019bd28a29f19bb4f7a9c32434b208b6d04db221
--- 1/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
--- 2/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
@@@ -24,8 -25,8 +25,9 @@@ properties
                - realtek,rtd1619-mali
                - renesas,r9a07g044-mali
                - renesas,r9a07g054-mali
+               - renesas,r9a09g057-mali
                - rockchip,px30-mali
 +              - rockchip,rk3562-mali
                - rockchip,rk3568-mali
                - rockchip,rk3576-mali
            - const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable

diff --cc drivers/of/base.c
Simple merge

diff --cc drivers/of/of_private.h
index 1bdc7ceef3c5fc854bd7708a50281bbfa439838d,b0c077867bf4abc045ca332ebacb988cdead90fc..733a0541fc59e6cf50cee925ac6bae44f57d7210
--- 1/drivers/of/of_private.h
--- 2/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 */

diff --cc include/linux/of.h
Simple merge