linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephan Gerhold <stephan@gerhold.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Vinod Koul <vkoul@kernel.org>
Cc: Kishon Vijay Abraham I <kishon@ti.com>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Shawn Guo <shawn.guo@linaro.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the gcom tree
Date: Tue, 26 Oct 2021 08:28:37 +0200	[thread overview]
Message-ID: <YXegFbfxh/0nhDmB@gerhold.net> (raw)
In-Reply-To: <20211026154415.3f6c7c28@canb.auug.org.au>

Hi,

On Tue, Oct 26, 2021 at 03:44:15PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
> 
> between commit:
> 
>   442ee1fc60c4 ("arm64: dts: qcom: Drop unneeded extra device-specific includes")
> 
> from the gcom tree and commit:
> 
>   956bbf2a94e8 ("arm64: dts: qcom: Add missing vdd-supply for QUSB2 PHY")
> 
> from the phy-next tree.
> 

Sorry about that.

> I fixed it up (the former removed the file, so I did that) and can

The commit actually simply moves all of apq8096-db820c.dtsi into
apq8096-db820c.dts. So we should make sure that the vdd-supply added in
956bbf2a94e8 ("arm64: dts: qcom: Add missing vdd-supply for QUSB2 PHY")
ends up in almost the same position in apq8096-db820c.dts instead.

But I'm confused why the arm64 dts commit is in the phy-next tree. There
is no compile time dependency between it and the related phy commits so
it could have just been applied to the qcom tree to avoid this conflict.

And actually Vinod wrote 2 minutes after applying this patch that Bjorn
should take it through the qcom tree:

https://lore.kernel.org/linux-arm-msm/YVwDbUC5WUHmcRJh@matsya/

Vinod, did you apply it accidentally or am I missing something here? :)

Thanks,
Stephan

  reply	other threads:[~2021-10-26  6:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-26  4:44 linux-next: manual merge of the phy-next tree with the gcom tree Stephen Rothwell
2021-10-26  6:28 ` Stephan Gerhold [this message]
2021-10-26 11:05   ` Vinod Koul

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=YXegFbfxh/0nhDmB@gerhold.net \
    --to=stephan@gerhold.net \
    --cc=agross@kernel.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=kishon@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shawn.guo@linaro.org \
    --cc=vkoul@kernel.org \
    /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).