linux-kernel - linux-next: manual merge of the slave-dma tree with the imx-mxs 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: <20131129113201.ed4d0e254c20bcaac82c822f@canb.auug.org.au>
Date:	Fri, 29 Nov 2013 11:32:01 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Vinod Koul <vinod.koul@...el.com>, Shawn Guo <shawn.guo@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nicolin Chen <b42378@...escale.com>,
	Lucas Stach <l.stach@...gutronix.de>
Subject: linux-next: manual merge of the slave-dma tree with the imx-mxs
 tree

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/boot/dts/imx53.dtsi between commit a0cd556100d0 ("ARM: imx53:
use clock defines in DTS files") from the imx-mxs tree and commit
786f0db6d439 ("ARM: dts: imx: use dual-fifo sdma script for ssi") from
the slave-dma 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/imx53.dtsi
index 4b2053b585d1,7208fde9bc16..000000000000
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@@ -173,9 -152,9 +173,9 @@@
  					compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
  					reg = <0x50014000 0x4000>;
  					interrupts = <30>;
 -					clocks = <&clks 49>;
 +					clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
- 					dmas = <&sdma 24 1 0>,
- 					       <&sdma 25 1 0>;
+ 					dmas = <&sdma 24 22 0>,
+ 					       <&sdma 25 22 0>;
  					dma-names = "rx", "tx";
  					fsl,fifo-depth = <15>;
  					fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */

Content of type "application/pgp-signature" skipped