Received-SPF: pass (google.com: domain of linux-kernel+bounces-149407-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Thu, 18 Apr 2024 11:34:03 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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>
Subject: linux-next: manual merge of the net-next tree with the stm32 tree
Message-ID: <20240418113403.06e5ceed@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/dK=CpwLGHY4MIi=f.grU+VL";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/dK=CpwLGHY4MIi=f.grU+VL
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/of/property.c

between commit:

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

from the stm32 tree and commit:

  93c0d8c0ac30 ("of: property: Add fw_devlink support for pse parent")

from the net-next 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 dfdda94834d5,cc064151853e..000000000000
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1252,7 -1252,7 +1252,8 @@@ 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_SUFFIX_PROP(regulators, "-supply", NULL)
  DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
 =20

--Sig_/dK=CpwLGHY4MIi=f.grU+VL
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYgeIsACgkQAVBC80lX
0GyK2gf9F8PsfK2iumwz8tvEIJtyQYl1aDLpokl2QDXys/AAVMjSOZEK4P8aHHea
WcDdJgjx4CowEHdBsvFRPDRf7ku7D9n1GWhpzmVrkEMrSgl+n/245C7IdbLQcFO8
P/R5aP82LJZy9r1c52Rbd1o03z2v9bZKJ4e8Y4cxkQzcqv+Bbne+TKI2zHgW8Yy6
rcYQxI8xvaJK2bFIUJlBqUtFi47db7Ib5TMRtgs2dIKNm8Ly+zYJVRRccWewBlXW
pkLkGK4826hjOfPSLmhofn/0dfqQA2AH4A0QJU6nKcdxtKzVJ29+/AY1pH3TVK6c
5Say36uPL9DZ5TxMH+wksle6bl4/FA==
=e2O8
-----END PGP SIGNATURE-----

--Sig_/dK=CpwLGHY4MIi=f.grU+VL--