linux-kernel - linux-next: manual merge of the slave-dma tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Date:	Wed, 27 Jul 2011 12:08:26 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Vinod Koul <vinod.koul@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Russell King - ARM Linux" <linux@....linux.org.uk>
Subject: linux-next: manual merge of the slave-dma tree with Linus' tree

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/spi/spi-pl022.c (called drivers/spi/amba-pl022.c in the sleav-dma
tree) between commit 083be3f05371 ("spi/pl022: initialize burstsize from
FIFO trigger level") from Linus' tree and commit 001b0585ff16 ("Improve
slave/cyclic DMA engine documentation") from the slave-dma tree.

I fixed it up (see below) anc acn carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/spi/spi-pl022.c
index eba88c7,99e7880..0000000
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@@ -910,11 -908,11 +910,9 @@@ static int configure_dma(struct pl022 *
  {
  	struct dma_slave_config rx_conf = {
  		.src_addr = SSP_DR(pl022->phybase),
  	};
  	struct dma_slave_config tx_conf = {
  		.dst_addr = SSP_DR(pl022->phybase),
- 		.direction = DMA_TO_DEVICE,
 -		.dst_maxburst = pl022->vendor->fifodepth >> 1,
  	};
  	unsigned int pages;
  	int ret;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/