[alsa-devel] [PATCH v3 2/4] ARM: tegra: Add Harmony sound platform data type

Stephen Warren swarren at nvidia.com
Sat Jan 22 00:49:10 CET 2011

Mark Brown wrote on Sent: Friday, January 21, 2011 4:42 PM:
> On Fri, Jan 21, 2011 at 02:41:08PM -0800, Colin Cross wrote:
> > Could the same platform_data patch go into both ASoC and Tegra?  It
> > would fall out in the merge, no matter who gets pulled first.  If we
> > go that route, whichever place you put the header, one of the trees
> > will have an include file that is in the other tree's directory.
> The usual thing here would be a branch that gets merged into both trees
> (to avoid the commit getting duplicated) or to only apply in one tree and
> let things sort themselves out in -next and the merge window.

Ah yes, I do remember you mentioning that before. Now I realize exactly
what you mean.

I'm quite happy to create a branch for this, cherry-pick my change onto it,
and tell you where it is, so you can merge from it.

What should I base the branch off; since it's a simple file add, I guess
the current mainline tree would be fine.

I assume there are no specific requirements for where the branch is hosted;
i.e. something you can git clone over HTTP from my personal server would
be fine?



More information about the Alsa-devel mailing list