linux-kernel - linux-next: manual merge of the arm-soc tree with the slave-dma 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: <20120514184425.5747f862e369e2f291bfba69@canb.auug.org.au>
Date:	Mon, 14 May 2012 18:44:25 +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,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Richard Zhao <richard.zhao@...escale.com>,
	Vinod Koul <vinod.koul@...el.com>
Subject: linux-next: manual merge of the arm-soc tree with the slave-dma
 tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/imx-sdma.c between commit 2ccaef0520d1 ("dma: imx-sdma: make
channel0 operations atomic") from the slave-dma tree and commit
7560e3f3581e ("dmaengine i.MX SDMA: do not depend on grouped clocks")
from the arm-soc tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/dma/imx-sdma.c
index a472a29,fddccae..0000000
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -323,8 -322,9 +323,9 @@@ struct sdma_engine 
  	struct sdma_context_data	*context;
  	dma_addr_t			context_phys;
  	struct dma_device		dma_device;
- 	struct clk			*clk;
+ 	struct clk			*clk_ipg;
+ 	struct clk			*clk_ahb;
 -	struct mutex			channel_0_lock;
 +	spinlock_t			channel_0_lock;
  	struct sdma_script_start_addrs	*script_addrs;
  };
  

Content of type "application/pgp-signature" skipped