linux-kernel - linux-next: manual merge of the l2-mtd 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: <20120322135309.c27700c17c78d7c93de3d7db@canb.auug.org.au>
Date:	Thu, 22 Mar 2012 13:53:09 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Artem Bityutskiy <dedekind1@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexandre Bounine <alexandre.bounine@....com>,
	Vinod Koul <vinod.koul@...el.com>,
	Huang Shijie <b32955@...escale.com>
Subject: linux-next: manual merge of the l2-mtd tree with the slave-dma tree

Hi Artem,

Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/dma/mxs-dma.c between commit 185ecb5f4fd4 ("dmaengine: add
context parameter to prep_slave_sg and prep_dma_cyclic") from the
slave-dma tree and commit c790d78c631f ("mxs-dma : rewrite the last
parameter of mxs_dma_prep_slave_sg()") from the l2-mtd tree.

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/mxs-dma.c
index 65334c4,0ddfd30..0000000
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@@ -25,11 -26,8 +26,10 @@@
  
  #include <asm/irq.h>
  #include <mach/mxs.h>
- #include <mach/dma.h>
  #include <mach/common.h>
  
 +#include "dmaengine.h"
 +
  /*
   * NOTE: The term "PIO" throughout the mxs-dma implementation means
   * PIO mode of mxs apbh-dma and apbx-dma.  With this working mode,
@@@ -340,7 -374,7 +362,7 @@@ static void mxs_dma_free_chan_resources
  static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
  		struct dma_chan *chan, struct scatterlist *sgl,
  		unsigned int sg_len, enum dma_transfer_direction direction,
- 		unsigned long append, void *context)
 -		unsigned long flags)
++		unsigned long flags, void *context)
  {
  	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
  	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;

Content of type "application/pgp-signature" skipped