Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi

between commit:

  e490b52477b8 ("arm64: dts: amlogic: s7d: add ao secure node")

from the amlogic tree and commit:

  1d787348123b ("arm64: dts: amlogic: Add gpio_intc node for Amlogic S7D SoCs")

from the tip 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/amlogic/amlogic-s7d.dtsi
index e60167af0390,5ef16820b574..000000000000
--- a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
@@@ -195,13 -185,15 +195,23 @@@
  				};
  			};
  
+ 			gpio_intc: interrupt-controller@4080 {
+ 				compatible = "amlogic,s7d-gpio-intc",
+ 					     "amlogic,meson-gpio-intc";
+ 				reg = <0x0 0x4080 0x0 0x20>;
+ 				interrupt-controller;
+ 				#interrupt-cells = <2>;
+ 				amlogic,channel-interrupts =
+ 					<10 11 12 13 14 15 16 17 18 19 20 21>;
+ 			};
++
 +			ao-secure@10220 {
 +				compatible = "amlogic,s7d-ao-secure",
 +					     "amlogic,meson-gx-ao-secure",
 +					     "syscon";
 +				reg = <0x0 0x10220 0x0 0x140>;
 +				amlogic,has-chip-id;
 +			};
  		};
  	};
  };