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

[Takashi Iwai]

At Tue, 28 Apr 2009 12:55:16 -0400,
Jon Smirl wrote:
> 
> On Tue, Apr 28, 2009 at 12:51 PM, Takashi Iwai <tiwai at suse.de> wrote:
> > At Tue, 28 Apr 2009 11:59:01 -0400,
> > Jon Smirl wrote:
> >>
> >> On Tue, Apr 28, 2009 at 11:46 AM, Takashi Iwai <tiwai at suse.de> wrote:
> >> > At Tue, 28 Apr 2009 16:23:41 +0100,
> >> > Mark Brown wrote:
> >> >>
> >> >> From: Jon Smirl <jonsmirl at gmail.com>
> >> >>
> >> >> Basic split of mpc5200 DMA code out from i2s into a standalone file.
> >> >>
> >> >> [Fixed trailing whitespace -- broonie.]
> >> >>
> >> >> Signed-off-by: Jon Smirl <jonsmirl at gmail.com>
> >> >> Acked-by: Grant Likely <grant.likely at secretlab.ca>
> >> >> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> >> >
> >> > This patch conflicts with the last patch I merged to add
> >> > SNDRV_PCM_INFO_BATCH to some drivers including mpc5200.
> >> > (It's in fix/pcm-info-batch branch and not merged to */asoc branch
> >> >  yet.  Feel free to pull to your tree by yourself.)
> >> > And, the jiffies check shall be anyway fixed in the upstream PCM core
> >> > side, thus there is no big merit to hurry to merge the unfinished
> >> > changes now.
> >> >
> >> > So, could you back off mpc5200 changes and wait for a while until the
> >> > issue regarding PCM jiffies-check is resolved?
> >>
> >> This is why I was pushing so hard to get the patches that split the
> >> files in.
> >
> > And this is why I am against pulling now :)
> 
> 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.

Not really so.  The changes done in parallel repositories may
conflict always.  For example, this case would cause the conflict.
The difference is only who resolves the conflict...

In addition, this split is certainly not appropriate for 2.6.30
since it itself has nothing to do with the fix.


Takashi