Conflicts between Tegra PWM tree and common clock patches

[Stephen Warren]

On 07/02/2012 01:24 PM, Thierry Reding wrote:
> On Mon, Jul 02, 2012 at 11:35:04AM -0600, Stephen Warren wrote:
>> Thierry,
>> 
>> The following commits in your PWM tree conflict with some Tegra
>> clock driver re-structuring that's part of the common clock
>> conversion on Tegra.
>> 
>> df6da47 ARM: tegra: Provide clock for only one PWM controller 
>> 65e7385 ARM: tegra: Fix PWM clock programming
>> 
>> To alleviate this, could we either:
>> 
>> a) Remove those two commits from your tree and into the Tegra
>> tree. I think this won't cause any runtime issues, since Tegra
>> PWM is a feature we aren't using yet, so it's OK if the branch
>> it's made to work in is not the PWM branch.
>> 
>> b) If your branch is stable, I can merge it into the Tegra tree
>> in order to resolve the conflicts there. However, for this to
>> work, you need to 100% guarantee that the branch won't be rebased
>> between now and when you send Linus a pull request for 3.6.
> 
> I'd very much prefer a). Both patches touch only Tegra code anyway
> so there's no harm to take them through the Tegra tree. Both
> patches are also not dependent on the PWM framework in any way.

OK, I'll pick the patches into the Tegra tree as soon as fetching your
repo shows they aren't there.

Thanks!