linux-next: manual merge of the usb tree with the qcom tree
[email protected]
maintainerHi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/qcom/ipq6018.dtsi
between commit:
d1c10ab1494f0 ("arm64: dts: qcom: ipq6018: fix usb reference period")
from the qcom tree and commit:
5726079cd4860 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")
from the usb 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.
arch/arm64/boot/dts/qcom/ipq6018.dtsi +0 -0
(deleted the property updated by the qcom patch)
Quoted 28 lines · On Mon, Feb 21, 2022 at 07:16:41PM +0000, [email protected] wrote:
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/qcom/ipq6018.dtsibetween commit:
d1c10ab1494f0("arm64: dts: qcom: ipq6018: fix usb reference period")from the qcom tree and commit:
5726079cd4860("arm64: dts: ipq6018: Use reference clock to set dwc3 period")from the usb 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.
arch/arm64/boot/dts/qcom/ipq6018.dtsi +0
-0
Quoted 1 line
(deleted the property updated by the qcom patch)
Deleted files are good :)