Skip to contentSkip to conversation

mismerge of 'omap-cleanup-for-v3.6' into tmp-merge

DISCUSSION Kevin Hilman 2 participants 3 messages Jul 11, 2012 – Jul 13, 2012

lore
Share & tools
lore

Kevin Hilman

author
#0 lore raw

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�ׂ� does not exist

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

#1 lore raw
Quoted 11 lines · Kevin Hilman

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�ׂ� 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
Quoted 8 lines · Tony Lindgren
Quoted 7 lines · Kevin Hilman

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)

Quoted 7 lines
Quoted 4 lines

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

clockdomain: mpu_clkdm: powerdomain ({Z�ׂ� 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html