linux-kernel - linux-next: manual merge of the arm-soc tree with the l2-mtd 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: <20121127153714.2da0df11b77fc74601482ef4@canb.auug.org.au>
Date:	Tue, 27 Nov 2012 15:37:14 +1100
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,
	"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@...osoft.com>,
	Artem Bityutskiy <dedekind1@...il.com>,
	Vipul Kumar Samar <vipulkumar.samar@...com>,
	Bhavna Yadav <bhavna.yadav@...com>,
	Deepak Sikri <deepak.sikri@...com>,
	Rajeev Kumar <rajeev-dlh.kumar@...com>,
	Shiraz Hashim <shiraz.hashim@...com>,
	Vijay Kumar Mishra <vijay.kumar@...com>,
	Vipin Kumar <vipin.kumar@...com>,
	Viresh Kumar <viresh.kumar@...aro.org>
Subject: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/spear13xx.dtsi between commit 6d7b42a447f9 ("mtd:
fsmc_nand: pass the ale and cmd resource via resource") from the l2-mtd
tree and commit f631b984ee10 ("ARM: SPEAr: DT: Fix existing DT support")
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/spear13xx.dtsi
index 701b0d7,009096d..0000000
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@@ -151,6 -125,9 +165,7 @@@
  				      0 21 0x4
  				      0 22 0x4
  				      0 23 0x4>;
 -			st,ale-off = <0x20000>;
 -			st,cle-off = <0x10000>;
+ 			st,mode = <2>;
  			status = "disabled";
  		};
  

Content of type "application/pgp-signature" skipped