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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20121219104446.fdc2f77dd8176f059de63d5e@canb.auug.org.au>
Date:	Wed, 19 Dec 2012 10:44:46 +1100
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,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Akinobu Mita <akinobu.mita@...il.com>
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/dma/dmatest.c between commit 632fd28326c0 ("dmatest: implement
two helpers to unmap dma memory") from the  tree and commit f04f98e91bd8
("dmatest: adjust invalid module parameters for number of source
buffers") 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 drivers/dma/dmatest.c
index 64b048d,0e2deaa..0000000
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@@ -228,20 -228,13 +228,27 @@@ static void dmatest_callback(void *arg
  	wake_up_all(done->wait);
  }
  
 +static inline void unmap_src(struct device *dev, dma_addr_t *addr, size_t len,
 +			     unsigned int count)
 +{
 +	while (count--)
 +		dma_unmap_single(dev, addr[count], len, DMA_TO_DEVICE);
 +}
 +
 +static inline void unmap_dst(struct device *dev, dma_addr_t *addr, size_t len,
 +			     unsigned int count)
 +{
 +	while (count--)
 +		dma_unmap_single(dev, addr[count], len, DMA_BIDIRECTIONAL);
 +}
 +
+ static unsigned int min_odd(unsigned int x, unsigned int y)
+ {
+ 	unsigned int val = min(x, y);
+ 
+ 	return val % 2 ? val : val - 1;
+ }
+ 
  /*
   * This function repeatedly tests DMA transfers of various lengths and
   * offsets for a given operation type until it is told to exit by

Content of type "application/pgp-signature" skipped