From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Zhangfei Gao <zhangfei.gao@marvell.com>,
Vinod Koul <vinod.koul@linux.intel.com>
Subject: linux-next: manual merge of the arm-soc tree with the slave-dma tree
Date: Mon, 24 Sep 2012 19:28:44 +1000 [thread overview]
Message-ID: <20120924192844.51a4fa2f92ba220b1fec68d4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 842 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/mmp_tdma.c between commit f1a7757008b8 ("dmaengine: mmp_tdma:
add dt support") from the slave-dma tree and commit 293b2da1b611 ("ARM:
pxa: 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@canb.auug.org.au
diff --cc drivers/dma/mmp_tdma.c
index b93d73c,07fa486..0000000
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@@ -19,8 -19,7 +19,8 @@@
#include <linux/platform_device.h>
#include <linux/device.h>
#include <mach/regs-icu.h>
- #include <mach/sram.h>
+#include <linux/of_device.h>
+ #include <linux/platform_data/dma-mmp_tdma.h>
#include "dmaengine.h"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-24 9:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 9:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-16 2:26 linux-next: manual merge of the arm-soc tree with the slave-dma tree Stephen Rothwell
2013-01-16 2:22 Stephen Rothwell
2012-11-27 4:44 Stephen Rothwell
2012-11-27 5:38 ` Viresh Kumar
2012-11-28 3:26 ` Stephen Rothwell
2012-11-27 4:31 Stephen Rothwell
2012-09-24 9:44 Stephen Rothwell
2012-09-24 9:31 Stephen Rothwell
2012-05-14 8:44 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120924192844.51a4fa2f92ba220b1fec68d4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=vinod.koul@linux.intel.com \
--cc=zhangfei.gao@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).