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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20140328143952.7a77bc128f4affc3efd48ddf@canb.auug.org.au>
Date:	Fri, 28 Mar 2014 14:39:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Carlo Caione <carlo@...one.org>,
	Maxime Ripard <maxime.ripard@...e-electrons.com>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/boot/dts/sun7i-a20.dtsi between commit 36ab3e73b7ac ("ARM: dt:
sun7i: Add A20 SPI controller nodes") from the arm-soc tree and commit
8ff973a26763 ("ARM: sun7i/sun6i: dts: Add NMI irqchip support") from the
tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/boot/dts/sun7i-a20.dtsi
index 024a01ce4f0c,cadcf2f9881d..000000000000
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@@ -401,28 -339,14 +401,36 @@@
  		#size-cells = <1>;
  		ranges;
  
 +		spi0: spi@...05000 {
 +			compatible = "allwinner,sun4i-a10-spi";
 +			reg = <0x01c05000 0x1000>;
 +			interrupts = <0 10 4>;
 +			clocks = <&ahb_gates 20>, <&spi0_clk>;
 +			clock-names = "ahb", "mod";
 +			status = "disabled";
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +		};
 +
 +		spi1: spi@...06000 {
 +			compatible = "allwinner,sun4i-a10-spi";
 +			reg = <0x01c06000 0x1000>;
 +			interrupts = <0 11 4>;
 +			clocks = <&ahb_gates 21>, <&spi1_clk>;
 +			clock-names = "ahb", "mod";
 +			status = "disabled";
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +		};
 +
+ 		nmi_intc: interrupt-controller@...00030 {
+ 			compatible = "allwinner,sun7i-a20-sc-nmi";
+ 			interrupt-controller;
+ 			#interrupt-cells = <2>;
+ 			reg = <0x01c00030 0x0c>;
+ 			interrupts = <0 0 4>;
+ 		};
+ 
  		emac: ethernet@...0b000 {
  			compatible = "allwinner,sun4i-a10-emac";
  			reg = <0x01c0b000 0x1000>;

Content of type "application/pgp-signature" skipped