Message ID | alpine.DEB.2.00.1207040935070.6760@utopia.booyaka.com |
---|---|
State | New |
Headers | show |
* Paul Walmsley <paul@pwsan.com> [120704 08:48]: > Hi Tony > > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git tags/omap-devel-f-for-3.6 > > for you to fetch changes up to 8cb8de5d87b75f2ecaa1189079764340ea366c0e: > > Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6 (2012-07-04 06:05:51 -0600) > > ---------------------------------------------------------------- > > Miscellaneous OMAP clock, hwmod, clockdomain, and powerdomain patches > for 3.6. Mostly small infrastructure improvements, and preparation > for OMAP5 and AM33xx code. > > ---------------------------------------------------------------- Thanks applying into cleanup-part2 branch. Regards, Tony
Tony, On Thu, Jul 5, 2012 at 2:10 PM, Tony Lindgren <tony@atomide.com> wrote: > * Paul Walmsley <paul@pwsan.com> [120704 08:48]: >> Hi Tony >> >> The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: >> >> Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git tags/omap-devel-f-for-3.6 >> >> for you to fetch changes up to 8cb8de5d87b75f2ecaa1189079764340ea366c0e: >> >> Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6 (2012-07-04 06:05:51 -0600) >> >> ---------------------------------------------------------------- >> >> Miscellaneous OMAP clock, hwmod, clockdomain, and powerdomain patches >> for 3.6. Mostly small infrastructure improvements, and preparation >> for OMAP5 and AM33xx code. >> >> ---------------------------------------------------------------- > > Thanks applying into cleanup-part2 branch. > 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 ? regards Santosh
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. Regards santosh
* 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
On Fri, Jul 6, 2012 at 2:00 PM, Tony Lindgren <tony@atomide.com> wrote: > * 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. > Great. Thanks !! Regards Santosh