[alsa-devel] [PATCH 2/2] ASoC: tegra: complete Tegra->Tegra20 renaming

[Stephen Warren]

On 04/06/2012 07:23 AM, Mark Brown wrote:
> On Thu, Apr 05, 2012 at 03:54:54PM -0600, Stephen Warren wrote:
>> From: Stephen Warren <swarren at nvidia.com>
>>
>> Rename Tegra20-specific Kconfig variables, module filenames, all internal
>> symbol names, clocks, and platform devices, to reflect the fact the DAS
>> and I2S drivers are for a specific HW version.
> 
> Oops, sorry - replied to the wrong one - this one doesn't seem to apply
> against for-3.5, I applied 1/2 though.  I believe this is due to 3.4
> fixes not having propagated over 3.5 yet.  Can you regenerate against
> for-3.5 please, or perhaps it's best to wait until things have merged
> back up?

Yes, it's because of the I2S debugfs fix.

I'm not sure when "things have merged back up" will be; do you intend to
merge your for-3.4 branch into for-3.5 at any particular time, or
perhaps rebase your for-3.5 onto v3.4-rc2 when its out?

Alternatively, I can regenerate that patch against your for-3.5, but
then you'll get a merge conflict when merging in your for-3.4, since the
code it affects will have experienced a rename. Should be trivial to
resolve though.