linux-next: manual merge of the usb tree with the qcom tree

broonie
2022-02-21T19:17:00Z

Hi 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.

diff --cc arch/arm64/boot/dts/qcom/ipq6018.dtsi
index 4e7efa97724bd,a614b9f73e2cd..0000000000000
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi

(deleted the property updated by the qcom patch)