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: <20120924193108.f399195b821a835e0d3db08a@canb.auug.org.au>
Date:	Mon, 24 Sep 2012 19:31:08 +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,
	Matt Porter <mporter@...com>,
	Vinod Koul <vinod.koul@...ux.intel.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/mmc/host/davinci_mmc.c between commit b5daabbd3d18 ("mmc:
davinci_mmc: convert to DMA engine API") from the slave-dma tree and
commit ec2a0833e515 ("ARM: davinci: move platform_data definitions") from
the arm-soc 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/mmc/host/davinci_mmc.c
index c5e1eeb,3dfd347..0000000
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@@ -30,12 -30,11 +30,12 @@@
  #include <linux/io.h>
  #include <linux/irq.h>
  #include <linux/delay.h>
 +#include <linux/dmaengine.h>
  #include <linux/dma-mapping.h>
 +#include <linux/edma.h>
  #include <linux/mmc/mmc.h>
  
- #include <mach/mmc.h>
+ #include <linux/platform_data/mmc-davinci.h>
 -#include <mach/edma.h>
  
  /*
   * Register Definitions

Content of type "application/pgp-signature" skipped