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
On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote:
quoted hunk
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? :)
On Fri, Aug 06, 2021 at 01:08:26PM +0200, Greg Kroah-Hartman wrote:
On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote:
quoted
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? :)
The fix will be whatever was in HEAD.
Hi Mark,
On Fri, 6 Aug 2021 12:23:53 +0100 Mark Brown [off-list ref] wrote:
On Fri, Aug 06, 2021 at 01:08:26PM +0200, Greg Kroah-Hartman wrote:
quoted
On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote:
quoted
quoted
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? :)
The fix will be whatever was in HEAD.
I used the following instead. Is that wrong?
--
Cheers,
Stephen Rothwell
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
@@@ -2566,7 -2572,7 +2572,7 @@@
power-domains = <&gcc USB30_GDSC>;
status = "disabled";
- dwc3@6a00000 {
- usb3_dwc3: usb@6a00000 {
++ usb3_dwc3: dwc3@6a00000 {
compatible = "snps,dwc3";
reg = <0x06a00000 0xcc00>;
interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;