linux-kernel - linux-next: manual merge of the libata 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20140116114831.50261e22b6fb25aac2004b43@canb.auug.org.au>
Date:	Thu, 16 Jan 2014 11:48:31 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.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,
	Simon Guinot <simon.guinot@...uanux.org>,
	Jason Cooper <jason@...edaemon.net>
Subject: linux-next: manual merge of the libata tree with the arm-soc tree

Hi Tejun,

Today's linux-next merge of the libata tree got a conflict in
arch/arm/boot/dts/armada-370-xp.dtsi between commit a095b1c78a35 ("ARM:
mvebu: sort DT nodes by address") from the arm-soc tree and commit
a96cc303e42a ("ARM: mvebu: update the SATA compatible string for Armada
370/XP") from the libata 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/armada-370-xp.dtsi
index b6b253924893,df141a1d6448..000000000000
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -236,12 -183,13 +236,12 @@@
  				status = "disabled";
  			};
  
 -			i2c0: i2c@...00 {
 -				compatible = "marvell,mv64xxx-i2c";
 -				#address-cells = <1>;
 -				#size-cells = <0>;
 -				interrupts = <31>;
 -				timeout-ms = <1000>;
 -				clocks = <&coreclk 0>;
 +			sata@...00 {
- 				compatible = "marvell,orion-sata";
++				compatible = "marvell,armada-370-sata";
 +				reg = <0xa0000 0x5000>;
 +				interrupts = <55>;
 +				clocks = <&gateclk 15>, <&gateclk 30>;
 +				clock-names = "0", "1";
  				status = "disabled";
  			};
  

Content of type "application/pgp-signature" skipped