[alsa-devel] [PATCH 00/25] ASoC: Overhaul Samsung drivers

[Mark Brown]

On Tue, Oct 19, 2010 at 11:00:15AM +0300, Vasily khoruzhick wrote:
> Kukjin Kim <kgene.kim at samsung.com> wrote:

> > > I suggest the patches 13,14,16 & 17 go via Kgene's Tree, and the rest via
> > > ASoC
> > > tree due to tight dependencies.

> > Hmm...in my opinion, it would be better to me if could send arch/arm/ stuff
> > to upstream via my tree even though there are dependencies.
> > Mark, how do you think?

> As for me, that's not a good idea. We'll get massive breakage during
> 2.6.37 merge window then. Here's example: my sound-related changes to
> machine files are merged through Ben's tree, but these changes aren't
> in asoc tree, so Jassi is no aware of them, but now these changes are
> outdated a bit due to device renaming. And this introduce compile
> breakage.

Since my primary development platforms are Samsung reference boards I'm
especially unenthusiastic about anything which creates cross-tree
issues.  My stock answer to things like this is that if we can't split
things up so that dependencies are avoided then we should create a
branch which can be pulled into both trees.