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

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

Date:	Tue, 27 Jan 2015 13:04:37 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.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,
	Roger Chen <roger.chen@...k-chips.com>,
	Chris Zhong <zyw@...k-chips.com>,
	Heiko Stuebner <heiko@...ech.de>
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
arch/arm/boot/dts/rk3288.dtsi between commit eecfe981cecd ("ARM: dts:
rockchip: add RK3288 suspend support") from the arm-soc tree and commit
3d3fb74afc9b ("ARM: dts: rockchip: add gmac info for rk3288") from the
net-next 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/rk3288.dtsi
index 2a878a35facc,910dcad2088a..000000000000
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@@ -734,24 -741,11 +750,29 @@@
  			bias-disable;
  		};
  
+ 		pcfg_pull_none_12ma: pcfg-pull-none-12ma {
+ 			bias-disable;
+ 			drive-strength = <12>;
+ 		};
+ 
 +		sleep {
 +			global_pwroff: global-pwroff {
 +				rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>;
 +			};
 +
 +			ddrio_pwroff: ddrio-pwroff {
 +				rockchip,pins = <0 1 RK_FUNC_1 &pcfg_pull_none>;
 +			};
 +
 +			ddr0_retention: ddr0-retention {
 +				rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_up>;
 +			};
 +
 +			ddr1_retention: ddr1-retention {
 +				rockchip,pins = <0 3 RK_FUNC_1 &pcfg_pull_up>;
 +			};
 +		};
 +
  		i2c0 {
  			i2c0_xfer: i2c0-xfer {
  				rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,

Content of type "application/pgp-signature" skipped