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:   Fri, 18 Mar 2022 18:39:15 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Olof Johansson <olof@lixom.net>,
        Arnd Bergmann <arnd@arndb.de>
Cc:     Michal Simek <michal.simek@xilinx.com>,
        Michal Simek <monstr@monstr.eu>,
        David Heidelberg <david@ixit.cz>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sean Anderson <sean.anderson@seco.com>,
        ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the usb tree with the xilinx tree
Message-ID: <20220318183915.08544653@canb.auug.org.au>
In-Reply-To: <d7f84e0a-7c3a-116a-0911-2ed5a0bab2d9@xilinx.com>
References: <20220210141550.56359523@canb.auug.org.au>
        <YgTGdwkTkDgx+pan@kroah.com>
        <d7f84e0a-7c3a-116a-0911-2ed5a0bab2d9@xilinx.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/PJVRzEizXvFrKDqxVxbgvhI";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Thu, 10 Feb 2022 13:24:44 +0100 Michal Simek <michal.simek@xilinx.com> w=
rote:
>
> On 2/10/22 09:01, Greg KH wrote:
> > On Thu, Feb 10, 2022 at 02:15:50PM +1100, Stephen Rothwell wrote: =20
> >>
> >> 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 tr=
ee
> >> is submitted for merging.  You may also want to consider cooperating
> >> with the maintainer of the conflicting tree to minimise any particular=
ly
> >> 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, =20
> >> Stephen Rothwell =20
> >=20
> >=20
> >=20
> > Looks good, thanks! =20
>=20
> +1 on this.

This is now a conflict between the usb tree and the arm-soc tree.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmI0NyMACgkQAVBC80lX
0GyzXAf8CM9oN7bvxMkix19UMXbQNqqe0tm8SWZCZJZtZLXa5MZLuUqOFLrwYUwZ
0fm63wN2A2ti271tO6w5A6aStMD1I+0L/XGU9efaZqw/7GDwrVn6tgvAZg6LxZ48
/W5hHhGQqEBRx/OZW3zU00vAeFFKNTQVBSHIexGINPZuRPLfNln9hfaU692d1ext
la2JADEjm9zTvRN2kJV0Pety5Vaq1EJAyFTCkbFfz5x8vWdOQLirgsXXEs1giLtX
/zhO7edJkUJ8+YxQBoOumjssG7u/KMpDflysASHkmtnVOcBDfddyltkTch+/pBlw
UGVDCeOU6Q1jY9qB/WL8z8Ev9xa4oA==
=LVhJ
-----END PGP SIGNATURE-----

--Sig_/PJVRzEizXvFrKDqxVxbgvhI--