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,
Sachin Kamat <sachin.kamat@linaro.org>,
Samuel Ortiz <sameo@linux.intel.com>,
Matt Porter <mporter@ti.com>, Sekhar Nori <nsekhar@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the tree
Date: Fri, 21 Jun 2013 16:45:12 +1000 [thread overview]
Message-ID: <20130621164512.261ad1e1a0cb27f45e955601@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 921 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
include/linux/mfd/davinci_voicecodec.h between commit 997174705458 ("mfd:
davinci_voicecodec: Fix build breakage") from the mfd tree and commit
3ad7a42d5a9c ("ARM: davinci: move private EDMA API to arm/common") 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 include/linux/mfd/davinci_voicecodec.h
index 810aee7,7dd6524..0000000
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@@ -26,10 -26,8 +26,10 @@@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/mfd/core.h>
+ #include <linux/platform_data/edma.h>
- #include <mach/edma.h>
+#include <mach/hardware.h>
+
/*
* Register values.
*/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-06-21 6:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 6:45 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-27 0:45 linux-next: manual merge of the arm-soc tree with the tree Stephen Rothwell
2014-05-27 17:49 ` Tony Lindgren
2014-04-07 0:21 Stephen Rothwell
2013-10-29 7:57 Stephen Rothwell
2012-11-27 4:48 Stephen Rothwell
2012-09-25 6:37 Stephen Rothwell
2012-09-25 7:14 ` Tony Prisk
2012-09-17 8:02 Stephen Rothwell
2012-03-08 6:03 Stephen Rothwell
2012-03-08 6:17 ` 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=20130621164512.261ad1e1a0cb27f45e955601@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=mporter@ti.com \
--cc=nsekhar@ti.com \
--cc=olof@lixom.net \
--cc=sachin.kamat@linaro.org \
--cc=sameo@linux.intel.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).