From: Tony Lindgren <tony@atomide.com>
To: "Shilimkar, Santosh" <santosh.shilimkar@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] ARM: OMAP2+: miscellaneous PRCM & hwmod patches for 3.6
Date: Fri, 6 Jul 2012 01:30:23 -0700 [thread overview]
Message-ID: <20120706083023.GP1122@atomide.com> (raw)
In-Reply-To: <CAMQu2gyA0XF01gi_2Y_7eOY+NFKPidY6dUah3Rh-FnqpC37vfg@mail.gmail.com>
* Shilimkar, Santosh <santosh.shilimkar@ti.com> [120706 01:32]:
> On Fri, Jul 6, 2012 at 1:39 PM, Tony Lindgren <tony@atomide.com> wrote:
> > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [120705 04:26]:
> >>
> >> Looks like the merge has not happened correctly.
> >> I see from the commit log that, you had a merge conflict in omap_hwmod.c
> >> and probably while resolving that the below change got missed.
> >>
> >> Tarun Kanti DebBarma (1):
> >> ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
> >>
> >> So I tried pulling Paul's branch again on "cleanup-part2" at commit 8cb8de5d87
> >> and it got merged without any conflicts.
> >>
> >> Do you want to re-merge Paul's series in cleanup-part2 or re-apply the above
> >> patch ?
> >
> > Hmm weird, I wonder how I managed to mess up the resolve like that..
> > I'll (re)apply the following fix as the branch has been pushed out already.
> >
> Sounds good to me. Can you update the barcnh please ?
> I don't see that patch yet in cleanup-part2.
Pushed out now at commit ae6df418 (ARM: OMAP2+: dmtimer: cleanup fclk usage)
also applied. Might take a while for it to get mirrored.
Regards,
Tony
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM: OMAP2+: miscellaneous PRCM & hwmod patches for 3.6
Date: Fri, 6 Jul 2012 01:30:23 -0700 [thread overview]
Message-ID: <20120706083023.GP1122@atomide.com> (raw)
In-Reply-To: <CAMQu2gyA0XF01gi_2Y_7eOY+NFKPidY6dUah3Rh-FnqpC37vfg@mail.gmail.com>
* Shilimkar, Santosh <santosh.shilimkar@ti.com> [120706 01:32]:
> On Fri, Jul 6, 2012 at 1:39 PM, Tony Lindgren <tony@atomide.com> wrote:
> > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [120705 04:26]:
> >>
> >> Looks like the merge has not happened correctly.
> >> I see from the commit log that, you had a merge conflict in omap_hwmod.c
> >> and probably while resolving that the below change got missed.
> >>
> >> Tarun Kanti DebBarma (1):
> >> ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
> >>
> >> So I tried pulling Paul's branch again on "cleanup-part2" at commit 8cb8de5d87
> >> and it got merged without any conflicts.
> >>
> >> Do you want to re-merge Paul's series in cleanup-part2 or re-apply the above
> >> patch ?
> >
> > Hmm weird, I wonder how I managed to mess up the resolve like that..
> > I'll (re)apply the following fix as the branch has been pushed out already.
> >
> Sounds good to me. Can you update the barcnh please ?
> I don't see that patch yet in cleanup-part2.
Pushed out now at commit ae6df418 (ARM: OMAP2+: dmtimer: cleanup fclk usage)
also applied. Might take a while for it to get mirrored.
Regards,
Tony
next prev parent reply other threads:[~2012-07-06 8:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-04 15:43 [GIT PULL] ARM: OMAP2+: miscellaneous PRCM & hwmod patches for 3.6 Paul Walmsley
2012-07-04 15:43 ` Paul Walmsley
2012-07-05 8:40 ` Tony Lindgren
2012-07-05 8:40 ` Tony Lindgren
2012-07-05 11:21 ` Shilimkar, Santosh
2012-07-05 11:21 ` Shilimkar, Santosh
2012-07-06 8:09 ` Tony Lindgren
2012-07-06 8:09 ` Tony Lindgren
2012-07-06 8:27 ` Shilimkar, Santosh
2012-07-06 8:27 ` Shilimkar, Santosh
2012-07-06 8:30 ` Tony Lindgren [this message]
2012-07-06 8:30 ` Tony Lindgren
2012-07-06 8:34 ` Shilimkar, Santosh
2012-07-06 8:34 ` Shilimkar, Santosh
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=20120706083023.GP1122@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=santosh.shilimkar@ti.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.