From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7
Date: Sun, 23 Sep 2012 12:09:33 -0700 [thread overview]
Message-ID: <20120923190933.GS28835@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1209220211090.8626@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [120922 10:48]:
> On Fri, 21 Sep 2012, Tony Lindgren wrote:
>
> > Hmm I wonder what's causing it then? There must be something
> > else in tmp-merge at commit abfee61f that causes the problems.
> > Maybe try to merge with that commit and see what you get?
>
> Probably the merge with the clock patches was causing trouble.
>
> > That commit can't be used as a base though as that's temporary
> > most likely.. But we can create a base to use out of the
> > branches once we know them, you can do it yourself too.
>
> Your tmp-merge contains branch/tag merges that haven't yet gone upstream
> to arm-soc. I don't know which of those merges you consider stable (aside
> from the upstream ones, obviously). For this one it looks like the clock
> patches were the ones causing the merge trouble. So since that series
> also came from me and is unmerged, will just merge the clock and hwmod
> patches into a new pull request on v3.6-rc6 + cleanup-fixes-for-v3.7 +
> omap-devel-am33xx-for-v3.7. Hopefully that will work for you...
Well tmp-merge is a merge of the upstream branches, but the branch
itself is temporary. The issue here is that's it's too messy to get
your branch merged currently because of the various merge conflicts with
other branches. Trying to merge in your updated branch for testing
into tmp-merge with the other branches produces:
CONFLICT (content): Merge conflict in drivers/spi/spi-omap2-mcspi.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/gpmc.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clkt_dpll.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clkt_clksel.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clkt34xx_dpll3m2.c
It seems to be conflicting with your own formatting changes,
am33xx changes, PMU changes and RNG changes. Sounds like we're
safest to wait for -rc1 to for the dependencies to clear?
Regards,
Tony
next prev parent reply other threads:[~2012-09-23 19:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-21 1:04 [GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7 Paul Walmsley
2012-09-21 20:53 ` Tony Lindgren
2012-09-21 23:10 ` Tony Lindgren
2012-09-22 0:03 ` Paul Walmsley
2012-09-22 0:21 ` Tony Lindgren
2012-09-22 17:47 ` Paul Walmsley
2012-09-23 19:09 ` Tony Lindgren [this message]
2012-09-23 21:06 ` Tony Lindgren
2012-09-24 1:08 ` Paul Walmsley
2012-09-24 2:30 ` Tony Lindgren
2012-09-24 19:51 ` Paul Walmsley
2012-09-23 22:59 ` Paul Walmsley
2012-09-22 5:40 ` Paul Walmsley
2012-09-22 15:44 ` Tony Lindgren
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=20120923190933.GS28835@atomide.com \
--to=tony@atomide.com \
--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).