netdev - linux-next: manual merge of the arm-soc tree with the net-next 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20130621155846.71c2d64923a1e505c08eca72@canb.auug.org.au>
Date:	Fri, 21 Jun 2013 15:58:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	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,
	Maxime Ripard <maxime.ripard@...e-electrons.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: linux-next: manual merge of the arm-soc tree with the net-next tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/sun4i-a10.dtsi between commit b21da664120b ("ARM:
sun4i: Add muxing options for the ethernet controller") from the net-next
tree and commit 27cce4ff34ec ("ARM: sun4i: dt: Add i2c muxing options")
from the arm-soc 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/sun4i-a10.dtsi
index 983da33,82e03d2..0000000
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@@ -214,18 -204,28 +220,39 @@@
  				allwinner,function = "uart1";
  				allwinner,drive = <0>;
  				allwinner,pull = <0>;
 +			};
 +
 +			emac_pins_a: emac0@0 {
 +				allwinner,pins = "PA0", "PA1", "PA2",
 +						"PA3", "PA4", "PA5", "PA6",
 +						"PA7", "PA8", "PA9", "PA10",
 +						"PA11", "PA12", "PA13", "PA14",
 +						"PA15", "PA16";
 +				allwinner,function = "emac";
 +				allwinner,drive = <0>;
 +				allwinner,pull = <0>;
  			};
+ 
+ 			i2c0_pins_a: i2c0@0 {
+ 				allwinner,pins = "PB0", "PB1";
+ 				allwinner,function = "i2c0";
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
+ 
+ 			i2c1_pins_a: i2c1@0 {
+ 				allwinner,pins = "PB18", "PB19";
+ 				allwinner,function = "i2c1";
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
+ 
+ 			i2c2_pins_a: i2c2@0 {
+ 				allwinner,pins = "PB20", "PB21";
+ 				allwinner,function = "i2c2";
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
  		};
  
  		timer@...20c00 {

Content of type "application/pgp-signature" skipped