From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: conflicts between omap/cleanup branch and omap_dss2 tree
Date: Sun, 17 Jul 2011 23:39:32 +0200 [thread overview]
Message-ID: <201107172339.32516.arnd@arndb.de> (raw)
Hi Paul and Tomi,
I'm trying to get the arm-soc tree integrated into linux-next, but right
now that fails because of lots of conflicts in the arch/arm/mach-omap2/clock44xx_data.c
and arch/arm/mach-omap2/omap_hwmod_44xx_data.c files.
I've done a dumb resolution by pulling in the omap_dss2/for_next tree as a
depedency and taking Tomi's version of the files, which is probably wrong
but lets Stephen at least take the arm-soc tree.
Please fix this properly in either the omap or the omap_dss2 trees.
Arnd
next reply other threads:[~2011-07-17 21:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-17 21:39 Arnd Bergmann [this message]
2011-07-18 8:08 ` conflicts between omap/cleanup branch and omap_dss2 tree Tony Lindgren
2011-07-19 12:27 ` Archit Taneja
2011-07-19 12:59 ` Arnd Bergmann
2011-07-21 7:19 ` Tomi Valkeinen
2011-07-21 14:20 ` Arnd Bergmann
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=201107172339.32516.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.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).