Received-SPF: pass (google.com: domain of linux-kernel+bounces-146183-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Tue, 16 Apr 2024 13:42:54 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>
Cc: Herve Codina <herve.codina@bootlin.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the devicetree tree with Linus' tree
Message-ID: <20240416134254.33f7943f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Y74o2u2fPDep79udFKe9ZtC";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Y74o2u2fPDep79udFKe9ZtC
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 d=
evlink 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.

--=20
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 @@@
 =20
  #define pr_fmt(fmt)	"OF: " fmt
 =20
 +#include <linux/device.h>
+ #include <linux/cleanup.h>
  #include <linux/of.h>
  #include <linux/spinlock.h>
  #include <linux/slab.h>

--Sig_/Y74o2u2fPDep79udFKe9ZtC
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYd874ACgkQAVBC80lX
0GzT5gf7B0Y63SR6ROKnpQc+u/leniRu+Yd43RloswRh1kWLRo4iMwoFWthck6sE
X+M3PPVWMUd6ly0HBuZ1GxrdBHbCs6Vd1rt0FI4lbPI+h/cBcCpS+LNbmrjwc8he
XFE9s+eL3sXVizYfHeG5kFQq0z6jaXjwdl4AvsXQktTrrSQ0tcX79BzXIluriUb1
zRb9ZgY7XbdT1zdWRiY65Yoe60JDqwPrtGf4EeOas2T9tV/Mrmvxdjhc/GV9ydtf
cGcjkFpRFN5lICx8toZUSdWkP3KLO1DVc6msgmspB53tQYTEVnNLaArE6VtkYm8z
2SztfYKLFt9RX5x84E+exhBS//2rXg==
=L78L
-----END PGP SIGNATURE-----

--Sig_/Y74o2u2fPDep79udFKe9ZtC--