From: Thierry Reding <treding@nvidia.com>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
JC Kuo <jckuo@nvidia.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Nagarjuna Kristam <nkristam@nvidia.com>,
Corentin Labbe <clabbe@baylibre.com>,
Colin Cross <ccross@android.com>,
ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the tegra tree with the arm-soc tree
Date: Fri, 27 Mar 2020 14:18:31 +0100 [thread overview]
Message-ID: <20200327131831.GC2282366@ulmo> (raw)
In-Reply-To: <20200327092741.1dbd3242@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 2180 bytes --]
On Fri, Mar 27, 2020 at 09:27:41AM +1100, Stephen Rothwell wrote:
> 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.
Olof, Arnd,
There was a bit of back and forth on this because there happened to be a
conflict with the USB tree. I tried to clarify this as replies to the PR
request:
http://patchwork.ozlabs.org/patch/1254523/
But I suspect you may have missed those replies. The bottom line is,
there is a v2 of the pull request that has the patches that are now in
the Tegra tree. That's already part of a PR that went in through the USB
tree as a dependency to resolve the conflict.
So as a result there should be no need for ARM SoC to carry that PR. But
if you still want to merge it, please pull v2, which is here:
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.7-phy-v2
Sorry for the confusion,
Thierry
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-27 13:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 22:27 linux-next: manual merge of the tegra tree with the arm-soc tree Stephen Rothwell
2020-03-27 13:18 ` Thierry Reding [this message]
2020-03-27 13:50 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2020-07-19 23:04 Stephen Rothwell
2019-06-25 0:12 Stephen Rothwell
2015-12-02 11:46 Mark Brown
2013-03-18 4:31 Stephen Rothwell
2013-03-18 15:23 ` Stephen Warren
2013-03-18 15:49 ` Arnd Bergmann
2013-01-23 5:30 Stephen Rothwell
2013-01-23 5:25 Stephen Rothwell
2013-01-16 3:14 Stephen Rothwell
2013-01-16 3:49 ` Tony Prisk
2013-01-16 4:32 ` Stephen Warren
2013-01-16 4:52 ` Tony Prisk
2013-01-16 16:27 ` Olof Johansson
2013-01-16 17:08 ` Stephen Warren
2013-01-16 17:35 ` Olof Johansson
2013-01-16 3:10 Stephen Rothwell
2013-01-16 3:12 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200327131831.GC2282366@ulmo \
--to=treding@nvidia.com \
--cc=arnd@arndb.de \
--cc=ccross@android.com \
--cc=clabbe@baylibre.com \
--cc=jckuo@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nkristam@nvidia.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).