Hi all,

Today's linux-next merge of the usb tree got conflicts in:

  arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
  arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts

between commit:

  39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone")

from the arm-soc tree and commit:

  1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
index 30e3e769d2b4,bae85f6b2bfa..000000000000
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
@@@ -14,17 -14,15 +14,6 @@@
  	compatible = "google,lazor-rev0", "qcom,sc7180";
  };
  
- &pp3300_hub {
- 	/* pp3300_l7c is used to power the USB hub */
- 	/delete-property/regulator-always-on;
- 	/delete-property/regulator-boot-on;
- };
- 
- &pp3300_l7c {
- 	regulator-always-on;
- 	regulator-boot-on;
 -/*
 - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is
 - * not supported by the PM6150 ADC driver. Disable the charger thermal zone
 - * to avoid using bogus temperature values.
 - */
 -&charger_thermal {
 -	status = "disabled";
--};
--
  &sn65dsi86_out {
  	/*
  	 * Lane 0 was incorrectly mapped on the cable, but we've now decided
diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
index c2ef06367baf,343ed457efb2..000000000000
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
@@@ -14,13 -14,20 +14,10 @@@
  	compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180";
  };
  
- &pp3300_hub {
- 	/* pp3300_l7c is used to power the USB hub */
- 	/delete-property/regulator-always-on;
- 	/delete-property/regulator-boot-on;
 -/*
 - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is
 - * not supported by the PM6150 ADC driver. Disable the charger thermal zone
 - * to avoid using bogus temperature values.
 - */
 -&charger_thermal {
 -	status = "disabled";
 -};
 -
 -
+ &usb_hub_2_0 {
+ 	 vdd-supply = <&pp3300_l7c>;
  };
  
- &pp3300_l7c {
- 	regulator-always-on;
- 	regulator-boot-on;
+ &usb_hub_3_0 {
+ 	 vdd-supply = <&pp3300_l7c>;
  };