Received-SPF: pass (google.com: domain of linux-kernel+bounces-178301-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 14 May 2024 14:22:44 +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: Re: linux-next: manual merge of the devicetree tree with the
 net-next, stm32 trees
Message-ID: <20240514142244.26010149@canb.auug.org.au>
In-Reply-To: <20240424134038.28532f2f@canb.auug.org.au>
References: <20240424134038.28532f2f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/wR5ZyYnSJ+GNMNmf.=HWaa4";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/wR5ZyYnSJ+GNMNmf.=HWaa4
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 24 Apr 2024 13:40:38 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>=20
>   drivers/of/property.c
>=20
> between commits:
>=20
>   6a15368c1c6d ("of: property: fw_devlink: Add support for "access-contro=
ller"")
>   93c0d8c0ac30 ("of: property: Add fw_devlink support for pse parent")
>=20
> from the net-next, stm32 trees and commit:
>=20
>   669430b183fc ("of: property: fw_devlink: Add support for "power-supplie=
s" binding")
>=20
> from the devicetree tree.
>=20
> 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.

Due to the addition of commit

  d976c6f4b32c ("of: property: Add fw_devlink support for interrupt-map pro=
perty")

to the devicetree tree, the resolution now looks like below.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/of/property.c
index 0320f1ae9b4d,21f59e3cd6aa..000000000000
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1252,8 -1241,7 +1241,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,10 -1398,10 +1400,12 @@@ 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_interrupt_map, },
 +	{ .parse_prop =3D parse_access_controllers, },
  	{ .parse_prop =3D parse_regulators, },
  	{ .parse_prop =3D parse_gpio, },
  	{ .parse_prop =3D parse_gpios, },

--Sig_/wR5ZyYnSJ+GNMNmf.=HWaa4
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZC5xQACgkQAVBC80lX
0Gzv1Qf+PrVZES3IAyzKbzajZbZJC4kEgAdW2nCeyMfcsTOFMIDIhoX6qbSmtM5c
lqzjU5G6HcJp3xmNLRHpnckQteCdDYqbcfL+dhKp8b2tlwX5v/FiRir1uTZI9xe7
tiioiReCopq2niygDmn7ZlBIppbGCEmcDM5OOAP34Z51J2iAp3lSY18ms2fx01Of
rvLGTEVEL52rKFRUWiqqvSCkpErVl/WdBj+gD8YiBQpeW1/eJk472JV78ojoVN0+
V4BC8SaeboYgErtn8i+m6pBIEuVuavkF9ZCPAINIZ9rHrZzvsGBb8fZmev/NS3ql
m502uxAcP3c+SMLNDB5xfMTyfphx3Q==
=Ts1P
-----END PGP SIGNATURE-----

--Sig_/wR5ZyYnSJ+GNMNmf.=HWaa4--