[alsa-devel] [PATCH 16/17] ASoC: Basic split of mpc5200 DMA code out from mpc5200_psc_i2s

Mark Brown broonie at sirena.org.uk
Tue Apr 28 21:37:15 CEST 2009

On Tue, Apr 28, 2009 at 12:55:16PM -0400, Jon Smirl wrote:

> I wanted the split files added to 2.6.30 not 2.6.31. If they had gone
> into 2.6.30 you would have patched after the split and everything
> would have propagated without merge conflicts. In general, changes in
> git that cross a file split will cause manual manual merges in
> everything pending past the split.

It wouldn't have helped with the merge issues since bug fixes get merged
up into the 2.6.31 branch very fast.  In any case, we're in the -rc part
of the development cycle - we should be merging targetted bug fixes
only.  Eyebrows would be raised by a diff of that size going in.

More information about the Alsa-devel mailing list