Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 10 Feb 2022 14:15:50 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Michal Simek <monstr@monstr.eu>
Cc:     David Heidelberg <david@ixit.cz>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michal Simek <michal.simek@xilinx.com>,
        Sean Anderson <sean.anderson@seco.com>
Subject: linux-next: manual merge of the usb tree with the xilinx tree
Message-ID: <20220210141550.56359523@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fy3+0PX1DoNv9IYfv3B555E";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/fy3+0PX1DoNv9IYfv3B555E
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/arm64/boot/dts/xilinx/zynqmp.dtsi

between commit:

  eceb6f8677d3 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")

from the xilinx tree and commit:

  d8b1c3d0d700 ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")

from the usb 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.

diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 056761c974fd,ba68fb8529ee..000000000000
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@@ -823,6 -824,8 +822,7 @@@
  				interrupt-parent =3D <&gic>;
  				interrupt-names =3D "dwc_usb3", "otg";
  				interrupts =3D <0 65 4>, <0 69 4>;
+ 				clock-names =3D "bus_early", "ref";
 -				#stream-id-cells =3D <1>;
  				iommus =3D <&smmu 0x860>;
  				snps,quirk-frame-length-adjustment =3D <0x20>;
  				/* dma-coherent; */
@@@ -849,6 -851,8 +848,7 @@@
  				interrupt-parent =3D <&gic>;
  				interrupt-names =3D "dwc_usb3", "otg";
  				interrupts =3D <0 70 4>, <0 74 4>;
+ 				clock-names =3D "bus_early", "ref";
 -				#stream-id-cells =3D <1>;
  				iommus =3D <&smmu 0x861>;
  				snps,quirk-frame-length-adjustment =3D <0x20>;
  				/* dma-coherent; */
--=20
Cheers,
Stephen Rothwell

--Sig_/fy3+0PX1DoNv9IYfv3B555E
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIEg2YACgkQAVBC80lX
0GyQyAgAjW4GZ0U3SydpR+bqSSnGsMP7XxYhEs4iEI+BYobsVQF7CpxltltIsEdU
KdhUz+NwDfnoxa2pv3A9JEfTYDZDw2MIraFiZ6vM8CfiWeGDjTXsvcvQDnKTvR3Y
IX3WENv0I5V863hyJtgd0iJLY90Ww/h9UvXlGqV9S8F1BHK90LGLGqjWkI9v9CDQ
q5sT4qfQe07cwJ9x8Ni+0Nr78tXPdSoMCQB38JmoailgxVHufIXQC1/B7H2ysj30
MZvGYUPX8ADMLQ1UDSH07e6MT7EpINydKBZDbWXvaYNrrwZM5nZAZTlBIB8kucAJ
64fGrpkZ/llMvMWHF+fRI8VWwMQbPA==
=8QhC
-----END PGP SIGNATURE-----

--Sig_/fy3+0PX1DoNv9IYfv3B555E--