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

Stephen Rothwell
2024-04-16T03:42:56Z

[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

drivers/of/dynamic.c

between commit:

8917e7385346 ("of: dynamic: Synchronize of_changeset_destroy() with the devlink removals")

from Linus' tree and commit:

40b0f17453fc ("of: Use scope based kfree() cleanups")

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/dynamic.c
index 4d57a4e34105,43f4e2c93bd2..000000000000
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@@ -9,7 -9,7 +9,8 @@@

#define pr_fmt(fmt) "OF: " fmt

+#include <linux/device.h>
+ #include <linux/cleanup.h>
#include <linux/of.h>
#include <linux/spinlock.h>
#include <linux/slab.h>