From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: 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>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@somainline.org>
Subject: Re: linux-next: manual merge of the qcom tree with the usb tree
Date: Fri, 6 Aug 2021 13:08:26 +0200 [thread overview]
Message-ID: <YQ0YKiFVx0KrkW5s@kroah.com> (raw)
In-Reply-To: <20210806102138.27373-1-broonie@kernel.org>
On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the qcom tree got a conflict in:
>
> arch/arm64/boot/dts/qcom/msm8996.dtsi
>
> between commit:
>
> 1f958f3dff42 ("Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name"")
>
> from the usb tree and commit:
>
> 9da65e441d4d ("arm64: dts: qcom: Add support for SONY Xperia X Performance / XZ / XZs (msm8996, Tone platform)")
>
> from the qcom 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/qcom/msm8996.dtsi
> index 78c55ca10ba9,31686950004e..000000000000
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
Love the fix, did something go wrong? :)
next prev parent reply other threads:[~2021-08-06 11:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 10:21 linux-next: manual merge of the qcom tree with the usb tree Mark Brown
2021-08-06 11:08 ` Greg Kroah-Hartman [this message]
2021-08-06 11:23 ` Mark Brown
2021-08-08 23:02 ` 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=YQ0YKiFVx0KrkW5s@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=agross@kernel.org \
--cc=angelogioacchino.delregno@somainline.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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