linux-next: manual merge of the net-next tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

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

  arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
  arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
  arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts

between commit:

  8c1be9336e9a ("arm64: dts: marvell: adjust whitespace around '='")

from the arm-soc tree and commit:

  4ce223e5ef70 ("arch: arm64: dts: marvell: rename the sfp GPIO properties")

from the net-next 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/marvell/armada-7040-mochabin.dts
index b9ba7c452a77,5f6ed735e31a..000000000000
--- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
@@@ -34,20 -34,20 +34,20 @@@
  	sfp_eth0: sfp-eth0 {
  		compatible = "sff,sfp";
  		i2c-bus = <&cp0_i2c1>;
- 		los-gpio = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>;
- 		mod-def0-gpio = <&sfp_gpio 2 GPIO_ACTIVE_LOW>;
- 		tx-disable-gpio = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>;
- 		tx-fault-gpio = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>;
+ 		los-gpios = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>;
+ 		mod-def0-gpios = <&sfp_gpio 2 GPIO_ACTIVE_LOW>;
+ 		tx-disable-gpios = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>;
 -		tx-fault-gpios  = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>;
++		tx-fault-gpios = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>;
  	};
  
  	/* SFP 1G */
  	sfp_eth2: sfp-eth2 {
  		compatible = "sff,sfp";
  		i2c-bus = <&cp0_i2c0>;
- 		los-gpio = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>;
- 		mod-def0-gpio = <&sfp_gpio 6 GPIO_ACTIVE_LOW>;
- 		tx-disable-gpio = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>;
- 		tx-fault-gpio = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>;
+ 		los-gpios = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>;
+ 		mod-def0-gpios = <&sfp_gpio 6 GPIO_ACTIVE_LOW>;
+ 		tx-disable-gpios = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>;
 -		tx-fault-gpios  = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>;
++		tx-fault-gpios = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>;
  	};
  };
  
diff --cc arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
index c0389dd17340,33c179838e24..000000000000
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@@ -65,10 -65,10 +65,10 @@@
  		/* CON15,16 - CPM lane 4 */
  		compatible = "sff,sfp";
  		i2c-bus = <&sfpp0_i2c>;
- 		los-gpio = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>;
- 		mod-def0-gpio = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>;
- 		tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>;
- 		tx-fault-gpio = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>;
+ 		los-gpios = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>;
+ 		mod-def0-gpios = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>;
+ 		tx-disable-gpios = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>;
 -		tx-fault-gpios  = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>;
++		tx-fault-gpios = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&cp1_sfpp0_pins>;
  		maximum-power-milliwatt = <2000>;
diff --cc arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
index cf868e0bbb9c,72e9b0f671a9..000000000000
--- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
@@@ -67,20 -67,20 +67,20 @@@
  	sfp_cp0_eth0: sfp-cp0-eth0 {
  		compatible = "sff,sfp";
  		i2c-bus = <&sfpplus0_i2c>;
- 		los-gpio = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>;
- 		mod-def0-gpio = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>;
- 		tx-disable-gpio = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>;
- 		tx-fault-gpio = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>;
+ 		los-gpios = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>;
+ 		mod-def0-gpios = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>;
+ 		tx-disable-gpios = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>;
 -		tx-fault-gpios  = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>;
++		tx-fault-gpios = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>;
  		maximum-power-milliwatt = <3000>;
  	};
  
  	sfp_cp1_eth0: sfp-cp1-eth0 {
  		compatible = "sff,sfp";
  		i2c-bus = <&sfpplus1_i2c>;
- 		los-gpio = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>;
- 		mod-def0-gpio = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>;
- 		tx-disable-gpio = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>;
- 		tx-fault-gpio = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>;
+ 		los-gpios = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>;
+ 		mod-def0-gpios = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>;
+ 		tx-disable-gpios = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>;
 -		tx-fault-gpios  = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>;
++		tx-fault-gpios = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>;
  		maximum-power-milliwatt = <3000>;
  	};

Attachment: pgpQfF7B0h8Hx.pgp
Description: OpenPGP digital signature