Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 27 Mar 2020 09:27:41 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
        Thierry Reding <treding@nvidia.com>,
        Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nagarjuna Kristam <nkristam@nvidia.com>,
        JC Kuo <jckuo@nvidia.com>, Corentin Labbe <clabbe@baylibre.com>
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree
Message-ID: <20200327092741.1dbd3242@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Tjrk3Z.A=gzsIRzl_glEECC";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/Tjrk3Z.A=gzsIRzl_glEECC
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the tegra tree got conflicts in:

  drivers/phy/tegra/Kconfig
  drivers/phy/tegra/xusb.c

between commits:

  5a00c7c7604f ("phy: tegra: xusb: Add usb-role-switch support")
  23babe30fb45 ("phy: tegra: xusb: Add usb-phy support")
  d74ce0954cb2 ("phy: tegra: xusb: Add support to get companion USB 3 port")
  58e7bd08b569 ("phy: tegra: xusb: Add Tegra194 support")

from the arm-soc tree and commit:

  f67213cee2b3 ("phy: tegra: xusb: Add usb-role-switch support")
  e8f7d2f409a1 ("phy: tegra: xusb: Add usb-phy support")
  5a40fc4b934c ("phy: tegra: xusb: Add support to get companion USB 3 port")
  1ef535c6ba8e ("phy: tegra: xusb: Add Tegra194 support")

from the tegra tree.

These are slightly different patches (the latter has been rebased).
Also there are further commits affecting these files in the tegra tree.

I fixed it up (I just used the version from the tegra tree) 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

--Sig_/Tjrk3Z.A=gzsIRzl_glEECC
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl59LF0ACgkQAVBC80lX
0GwyAQf+I5kTj3T8nDJGpq9RC07WHcKa32mVQgkMo2yk0xHSeyeD/pVxCFFUTAGM
Dbn3bOwyMiRP7eXlvvlMue8eIwqBa8iZefahef2i0CbV7nhKR8HLuvVJwspIilMP
IwA9rlKRT+ESRlP6c76oHbV43qSY6Bg1RtOLPw8CgqzcVFriItgDSbApN+VWvQSY
Fl8xpuqBhWajxLTjZULhQo/PpngggfPpTI2Z/PE2qBlh9HBQLAFYU/U2qcEaTah/
86h1R29S1m7VEuHlmzKmwyhB/Z8tt4zXRwhoN5ZdvLB9vXfrqT3HA015xZrPK12Y
/3jEJRBE5TZ4vM7QZ78S6h51LSEQsA==
=oWYQ
-----END PGP SIGNATURE-----

--Sig_/Tjrk3Z.A=gzsIRzl_glEECC--