linux-next: manual merge of the tip tree with the amlogic tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]

Hi all,

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

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

between commit:

  fe85b8876768 ("arm64: dts: amlogic: s6: add ao secure node")

from the amlogic tree and commit:

  4b6111d677c7 ("arm64: dts: amlogic: Add gpio_intc node for Amlogic S6 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-s6.dtsi
index da3e607aea85,f91368bc2c48..000000000000
--- a/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi
@@@ -200,13 -190,15 +200,23 @@@
  				};
  			};
  
+ 			gpio_intc: interrupt-controller@4080 {
+ 				compatible = "amlogic,s6-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,s6-ao-secure",
 +					     "amlogic,meson-gx-ao-secure",
 +					     "syscon";
 +				reg = <0x0 0x10220 0x0 0x140>;
 +				amlogic,has-chip-id;
 +			};
  		};
  	};
  };

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]