Received-SPF: pass (google.com: domain of linux-kernel+bounces-70681-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Mon, 19 Feb 2024 14:39:45 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Nuno Sa <nuno.sa@analog.com>,
 Olivier Moysan <olivier.moysan@foss.st.com>, Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the iio tree with Linus' tree
Message-ID: <20240219143945.1460f25f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/tXUY7csCIFfpbDRm+l9Nm2f";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  drivers/of/property.c

between commit:

  8f7e91790738 ("of: property: fix typo in io-channels")

from Linus' tree and commit:

  fd4464d218d5 ("of: property: add device link support for io-backends")

from the iio 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 a4f11b2f4ff0,ec914e4516d7..000000000000
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1222,7 -1244,8 +1222,8 @@@ DEFINE_SIMPLE_PROP(clocks, "clocks", "#
  DEFINE_SIMPLE_PROP(interconnects, "interconnects", "#interconnect-cells")
  DEFINE_SIMPLE_PROP(iommus, "iommus", "#iommu-cells")
  DEFINE_SIMPLE_PROP(mboxes, "mboxes", "#mbox-cells")
 -DEFINE_SIMPLE_PROP(io_channels, "io-channel", "#io-channel-cells")
 +DEFINE_SIMPLE_PROP(io_channels, "io-channels", "#io-channel-cells")
+ DEFINE_SIMPLE_PROP(io_backends, "io-backends", "#io-backend-cells")
  DEFINE_SIMPLE_PROP(interrupt_parent, "interrupt-parent", NULL)
  DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-cells")
  DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells")

--Sig_/tXUY7csCIFfpbDRm+l9Nm2f
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXSzYEACgkQAVBC80lX
0Gxrqwf+LFEm+rBw+Cy1ERMoexncey7Vz4sKhU2GMtIO7+QqSJVyz4PN3eoPG3JN
687ngTCQdvbWSGWtvdAiijYF9PK145d8p6s0yFRydJdBl7o74M15WnFah08CMEf9
W8rWAQssHK0cWYtcODKIGQQJZuSXvql4wnFcfGIDTRgqMUuYlp2T5s4bIarF3wtq
30uiKte8N08Wn1ZwIYc/2MId5Msx8wxG/62o8kVaNIHgxCTl7GZdBc80A/sce+f4
qYdOW7InP89hJp0LOZWLUxN8dltsKtQ3ZmSMZG6BREg9ZG5iVS9QinlzFagczXWk
/xj/v5+LsLEJ8aTlu1zx3qNg625pTQ==
=4GOt
-----END PGP SIGNATURE-----

--Sig_/tXUY7csCIFfpbDRm+l9Nm2f--