From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] ARM: OMAP: clock, powerdomain, clockdomain, hwmod fixes for early v3.4-rc
Date: Thu, 5 Apr 2012 09:42:24 -0700 [thread overview]
Message-ID: <20120405164223.GA3785@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1204050246410.10302@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan•com> [120405 01:53]:
> On Wed, 4 Apr 2012, Paul Walmsley wrote:
>
> > On Wed, 4 Apr 2012, Tony Lindgren wrote:
> >
> > > Thanks, looks like two of these patches I already merged into
> > > fixes yesterday from your earlier pull request. So merging this
> > > in would cause duplicate commits. Can you please update your
> > > branch to remove those two commits?
> >
> > Do you happen to recall which ones they are?
>
> Anyway, am guessing that you are planning to pull these into your
> 'fixes' branch? If so then probably the conflicts are with the
> misc_devel_3.4 branch patches. Will post another pull request for you
> with those two patches dropped. But if you're pulling these into a
> different branch, please let me know...
Yes it's the fixes branch I was talking about, thanks for updating it.
Tony
next prev parent reply other threads:[~2012-04-05 16:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-04 23:00 [GIT PULL] ARM: OMAP: clock, powerdomain, clockdomain, hwmod fixes for early v3.4-rc Paul Walmsley
2012-04-05 0:41 ` Tony Lindgren
2012-04-05 2:07 ` Paul Walmsley
2012-04-05 8:50 ` Paul Walmsley
2012-04-05 16:42 ` Tony Lindgren [this message]
2012-04-05 19:50 ` Paul Walmsley
2012-04-05 9:06 ` Madhusudhan.Gowda at elektrobit.com
2012-04-05 9:19 ` Paul Walmsley
2012-04-05 9:40 ` Madhusudhan.Gowda at elektrobit.com
2012-06-22 14:48 ` Paul Walmsley
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=20120405164223.GA3785@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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