Received-SPF: pass (google.com: domain of linux-kernel+bounces-156222-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Wed, 24 Apr 2024 13:40:38 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, David Miller <davem@davemloft.net>, Jakub
 Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Alexandre
 Torgue <alexandre.torgue@st.com>
Cc: Networking <netdev@vger.kernel.org>, Alexandre Torgue
 <alexandre.torgue@foss.st.com>, Gatien Chevallier
 <gatien.chevallier@foss.st.com>, "Kory Maincent (Dent Project)"
 <kory.maincent@bootlin.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Saravana Kannan <saravanak@google.com>
Subject: linux-next: manual merge of the devicetree tree with the net-next,
 stm32 trees
Message-ID: <20240424134038.28532f2f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/6VHmicBbB41m5RkaUQo4PEu";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/6VHmicBbB41m5RkaUQo4PEu
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/property.c

between commits:

  6a15368c1c6d ("of: property: fw_devlink: Add support for "access-controll=
er"")
  93c0d8c0ac30 ("of: property: Add fw_devlink support for pse parent")

from the net-next, stm32 trees and commit:

  669430b183fc ("of: property: fw_devlink: Add support for "power-supplies"=
 binding")

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/property.c
index aaf3ce74f85c,4ede45001025..000000000000
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1252,8 -1242,7 +1242,9 @@@ DEFINE_SIMPLE_PROP(backlight, "backligh
  DEFINE_SIMPLE_PROP(panel, "panel", NULL)
  DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells")
  DEFINE_SIMPLE_PROP(post_init_providers, "post-init-providers", NULL)
 +DEFINE_SIMPLE_PROP(access_controllers, "access-controllers", "#access-con=
troller-cells")
 +DEFINE_SIMPLE_PROP(pses, "pses", "#pse-cells")
+ DEFINE_SIMPLE_PROP(power_supplies, "power-supplies", NULL)
  DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
  DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
 =20
@@@ -1359,7 -1348,7 +1350,8 @@@ static const struct supplier_bindings o
  	{ .parse_prop =3D parse_backlight, },
  	{ .parse_prop =3D parse_panel, },
  	{ .parse_prop =3D parse_msi_parent, },
 +	{ .parse_prop =3D parse_pses, },
+ 	{ .parse_prop =3D parse_power_supplies, },
  	{ .parse_prop =3D parse_gpio_compat, },
  	{ .parse_prop =3D parse_interrupts, },
  	{ .parse_prop =3D parse_regulators, },

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYofzYACgkQAVBC80lX
0Gw/oAf/fKyulU2sd1RYcf+U2zsRb/N+YJjBdkPTI3QXWtAlU1N3guosEac4kGLV
uFipdLF85Ou+WQytSq03sVea+yhBCNfAv52kmvsn2NFYvgBwOnxqAonxAqyh6yWP
KaTfKZlnpUHJ8BuO1c/dJ8VimdJF+6PrEr3DWrGpleTeN1HXxIK1j9rA2WcBdpx8
rTSsaEZcivP+i98PfzhplBgMCbPdM7Bk4606cEv7beQ3f/3p0l+NKP6iZ4MQqYzZ
DhQFf/x+S2DBIrAIK6D2TZXzSg5qC91jjwcnEfbrdZrfbWZA7vNSyW3XpknuzE4R
RQ4hWgeLy8j1OrJSiJw7mDPTAgpp1g==
=TABj
-----END PGP SIGNATURE-----

--Sig_/6VHmicBbB41m5RkaUQo4PEu--