linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
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: Fri, 21 Sep 2012 16:10:40 -0700	[thread overview]
Message-ID: <20120921231039.GN28835@atomide.com> (raw)
In-Reply-To: <20120921205322.GK28835@atomide.com>

* Tony Lindgren <tony@atomide.com> [120921 13:55]:
> * Paul Walmsley <paul@pwsan.com> [120920 18:05]:
> > Hi Tony
> > 
> > The following changes since commit c4dbc7c086ce96d17f18b7a4a965b01d54d45f46:
> > 
> >   Merge tag 'cleanup-fixes-for-v3.7' into test_merge_v3.6-rc6_cleanup-fixes (2012-09-19 13:54:08 -0600)
> > 
> > are available in the git repository at:
> > 
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git tags/omap-devel-b-for-3.7
> 
> Thanks pulling into devel-late.
> 
> Note that we're pretty much out of time for v3.7 merge window, so
> most likely this won't get merged until for v3.8. See message
> "Status of arm-soc for 3.7"  posted to LAKML for details.

I tried merging this into tmp-merge, but ran into all kinds of
merge conflicts with the am33xx code etc and ended up with a
result that booted with all kinds of warnings on 2430sdp and
did not boot at all on zoom3 :) So I probably did something
wrong..

Care to base this on something more mergeable? Maybe a merge
of cleanup-fixes-for-v3.7 + omap-devel-am33xx-for-v3.7?

Ideally it would be based on something that merges nicely
when pulled into arm-soc/for-next, but that might be a bit
hard to do right now.

Regards,

Tony

  reply	other threads:[~2012-09-21 23:10 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 [this message]
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
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=20120921231039.GN28835@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).