From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: arnd@arndb.de
Cc: linux-next@vger.kernel.org, broonie@opensource.wolfsonmicro.com
Subject: linux-next: bad merge of asoc-3.4
Date: Mon, 26 Mar 2012 22:19:11 -0400 [thread overview]
Message-ID: <20120327021910.GC26825@windriver.com> (raw)
Hi Arnd,
Can you recheck the merge below? I think it needs this fix,
because a bisect on this failure led to your merge.
http://kisskb.ellerman.id.au/kisskb/buildresult/5968352/
Thanks,
Paul.
---
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 331f7cb..8bf8e99 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -114,7 +114,7 @@ static struct platform_device panda_abe_audio = {
.dev = {
.platform_data = &panda_abe_audio_data,
},
-}
+};
static struct platform_device btwilink_device = {
.name = "btwilink",
commit b9e1122c88996c20165b62e5be43cee644567ac4
Merge: 7068805 22f8d05
Author: Arnd Bergmann <arnd@arndb.de>
Date: Sat Mar 24 11:33:59 2012 +0000
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards
The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-omap2/board-omap4panda.c
reply other threads:[~2012-03-27 2:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20120327021910.GC26825@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-next@vger.kernel.org \
/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).