linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* mismerge of 'omap-cleanup-for-v3.6' into tmp-merge
@ 2012-07-11 20:10 Kevin Hilman
  2012-07-13  6:43 ` Tony Lindgren
  0 siblings, 1 reply; 3+ messages in thread
From: Kevin Hilman @ 2012-07-11 20:10 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: linux-omap, Mark A. Greer

Hi Tony,

In your current master branch, commit 3dd50d054 (Merge tag
'omap-cleanup-for-v3.6' into tmp-merge) added back the mpu_3xxx_clkdm
into the common clockdomains that was removed by commit 16e5e2c47 (ARM:
OMAP AM35x: clockdomain data: Fix clockdomain dependencies)

This causes duplicate registration attempts for mpu_clkdm and the second
registration causes a warning from the clockdomain layer:

   clockdomain: mpu_clkdm: powerdomain ({Z�\x18ׂ� does not exist

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: mismerge of 'omap-cleanup-for-v3.6' into tmp-merge
  2012-07-11 20:10 mismerge of 'omap-cleanup-for-v3.6' into tmp-merge Kevin Hilman
@ 2012-07-13  6:43 ` Tony Lindgren
  2012-07-13  7:00   ` Tony Lindgren
  0 siblings, 1 reply; 3+ messages in thread
From: Tony Lindgren @ 2012-07-13  6:43 UTC (permalink / raw)
  To: Kevin Hilman; +Cc: linux-omap, Mark A. Greer

* Kevin Hilman <khilman@ti.com> [120711 13:15]:
> Hi Tony,
> 
> In your current master branch, commit 3dd50d054 (Merge tag
> 'omap-cleanup-for-v3.6' into tmp-merge) added back the mpu_3xxx_clkdm
> into the common clockdomains that was removed by commit 16e5e2c47 (ARM:
> OMAP AM35x: clockdomain data: Fix clockdomain dependencies)
> 
> This causes duplicate registration attempts for mpu_clkdm and the second
> registration causes a warning from the clockdomain layer:
> 
>    clockdomain: mpu_clkdm: powerdomain ({Z�\x18ׂ� does not exist

OK. Can you please check if this issue is also in arm-soc for-next
and provide a patch if that's the case?

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: mismerge of 'omap-cleanup-for-v3.6' into tmp-merge
  2012-07-13  6:43 ` Tony Lindgren
@ 2012-07-13  7:00   ` Tony Lindgren
  0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2012-07-13  7:00 UTC (permalink / raw)
  To: Kevin Hilman; +Cc: linux-omap, Mark A. Greer

* Tony Lindgren <tony@atomide.com> [120712 23:48]:
> * Kevin Hilman <khilman@ti.com> [120711 13:15]:
> > Hi Tony,
> > 
> > In your current master branch, commit 3dd50d054 (Merge tag
> > 'omap-cleanup-for-v3.6' into tmp-merge) added back the mpu_3xxx_clkdm
> > into the common clockdomains that was removed by commit 16e5e2c47 (ARM:
> > OMAP AM35x: clockdomain data: Fix clockdomain dependencies)
> > 
> > This causes duplicate registration attempts for mpu_clkdm and the second
> > registration causes a warning from the clockdomain layer:
> > 
> >    clockdomain: mpu_clkdm: powerdomain ({Z�\x18ׂ� does not exist
> 
> OK. Can you please check if this issue is also in arm-soc for-next
> and provide a patch if that's the case?

Oh looks like Paul already sent a fix for this one as
"[PATCH] ARM: OMAP3: clockdomain: fix accidental duplicate".

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-07-13  7:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-11 20:10 mismerge of 'omap-cleanup-for-v3.6' into tmp-merge Kevin Hilman
2012-07-13  6:43 ` Tony Lindgren
2012-07-13  7:00   ` Tony Lindgren

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).