linux-next: manual merge of the usb tree with the qcom tree
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/qcom/ipq6018.dtsi
between commit:
261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description")
from the qcom tree and commit:
9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description")
from the usb tree.
Same author, same date, but the former has this committer comment:
bjorn: Changed dwc3 node name to usb, per binding
So I used that version.
I fixed it up (see above) 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.
Signature · 2 lines
Cheers, Stephen Rothwell
Quoted 6 lines · Stephen Rothwell
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/qcom/ipq6018.dtsi
Quoted 8 lines
between commit:
261e8a95d9aa("arm64: dts: qcom: ipq6018: add usb3 DT description")from the qcom tree and commit:
9da2c3f76164("arm64: qcom: ipq6018: add usb3 DT description")
Greg, this is not a USB patch, can you please drop it from your tree.
Thanks,
Bjorn
Quoted 18 lines
from the usb tree.
Same author, same date, but the former has this committer comment:
bjorn: Changed dwc3 node name to usb, per binding
So I used that version.
I fixed it up (see above) 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.
Signature · 2 lines
Cheers, Stephen Rothwell
Quoted 10 lines · Bjorn Andersson
Quoted 8 lines · Stephen Rothwell
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/qcom/ipq6018.dtsibetween commit:
Quoted 8 lines
Quoted 6 lines
261e8a95d9aa("arm64: dts: qcom: ipq6018: add usb3 DT description")from the qcom tree and commit:
9da2c3f76164("arm64: qcom: ipq6018: add usb3 DT description")Greg, this is not a USB patch, can you please drop it from your tree.
It was sent to me and says "add usb3 DT description", so how am I supposed to know to reject it?
I'll go revert it from my tree. {sigh}
greg k-h
Quoted 15 lines · Greg KH
Quoted 14 lines · Bjorn Andersson
Quoted 12 lines · Stephen Rothwell
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/qcom/ipq6018.dtsibetween commit:
261e8a95d9aa("arm64: dts: qcom: ipq6018: add usb3 DT description")from the qcom tree and commit:
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
9da2c3f76164("arm64: qcom: ipq6018: add usb3 DT description")Greg, this is not a USB patch, can you please drop it from your tree.
It was sent to me and says "add usb3 DT description", so how am I supposed to know to reject it?
It's a dts patch and as we saw in the last cycle bringing in patches through other trees has a strong tendency to result in merge conflicts down the road.
It seems like the patch was sent in a series together with driver changes, so I presume you took the whole series. Unfortunately it's quite common for these platform enablement efforts to be spread across multiple subsystems and we keep seeing the series be grouped by function rather than maintainer...
Not sure if there's anything to do about this.
Quoted 2 lines
I'll go revert it from my tree. {sigh}
Thanks!
Regards,
Bjorn