From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM: OMAP2+: hwmod data: cleanup in preparation for link array removal
Date: Thu, 8 Mar 2012 18:16:33 -0800 [thread overview]
Message-ID: <20120309021633.GE12083@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1203081900500.26543@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [120308 18:07]:
> Hi
>
> on second thought...
>
> On Thu, 8 Mar 2012, Paul Walmsley wrote:
>
> > On Thu, 8 Mar 2012, Tony Lindgren wrote:
> >
> > > Got these now merged into l-o master, but ran into a merge
> > > conflict with already queued sr branch. Resolved it by using
> > > your version except left out vdd_name.
> >
> > Definitely we want the vdd_name fields. Other than that it looks okay.
>
> I guess that other SR series that you merged removed the vdd_name fields?
So it seems, commit cea6b942124683305280962969599fed36f0ea7e. Then
the interrupts we added there for smartreflex it seems.
> If so then yeah, we'd better leave those out.
>
> This means that I'm going to have to rebase those big hwmod data changes
> :-(
>
> Can you send me a stable commit for that?
Bummer :( What we already have queued is the sr branch at commit
bb887688bccb48d94fa873f0f6cc7e7e3e4dc05e.
Regards,
Tony
prev parent reply other threads:[~2012-03-09 2:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 4:06 [GIT PULL] ARM: OMAP2+: hwmod data: cleanup in preparation for link array removal Paul Walmsley
2012-03-09 1:40 ` Tony Lindgren
2012-03-09 1:57 ` Paul Walmsley
2012-03-09 2:04 ` Paul Walmsley
2012-03-09 2:16 ` Tony Lindgren [this message]
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=20120309021633.GE12083@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).