[alsa-devel] [PATCH v2] ARM: Tegra: select MACH_HAS_SND_SOC_TEGRA_WM8903

[Stephen Warren]

Mark Brown wrote at Thursday, April 21, 2011 4:58 AM:
> On Tue, Apr 19, 2011 at 10:18:01AM -0600, Stephen Warren wrote:
> > CONFIG_SND_SOC_TEGRA_WM8903 is useful for many Tegra boards. To avoid the
> > ASoC tegra/Kconfig enumerating them all, instead have the Tegra machine
> > Kconfig select MACH_HAS_SND_SOC_TEGRA_WM8903 where appropriate, and have
> > SND_SOC_TEGRA_WM8903 depend on this.
> >
> > Signed-off-by: Stephen Warren <swarren at nvidia.com>
> > ---
> > Mark, this will need to be applied to your tegra branch so it can get
> > merged into both trees. Thanks.
> 
> I'm fairly sure it's not been generated against that branch - it doesn't
> apply since the branch doesn't have the rename of the board driver.
> I've fixed this up but please be more careful.

Yes, that patch was against your for-2.6.40 branch.

I'd assumed that since there would either be:

* A conflict applying the patch.
* A smooth merge of tegra into 2.6.40.

Or:

* No conflict applying the patch.
* A merge conflict merging tegra into 2.6.40.

It didn't matter which way around it was. However, thinking more I was
indeed wrong, since the conflicts in the initial application were more
complex than I'd thought through.

I guess the correct solution would have been for a clean application
to your tegra branch, then you'd be OK with the merge conflict into
2.6.40? I probably should have mentioned it in the patch either way.

Hopefully somebody Googling re: how to work cross-subsystem merges will
find these posts and avoid my mistakes.

Thanks for working it out!

-- 
nvpublic