On Thu, May 14, 2009 at 6:13 AM, Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: > On Wed, May 13, 2009 at 09:59:01PM -0400, Jon Smirl wrote: > >> Temporarily undo 2008f137e92220b98120c4803499cdddb2b0fb06 in sound/soc/fsl/mpc5200_psc_i2s.c so that it won't interfere with following patches that split mpc5200_psc_i2s.c. > > I'm fairly sure it's possible to squash these in with the other two > patches but I guess it's not the end of the world :( > You and I can easily see how this patch can be folded into the next one. Git is broken in this situation. I've reported the issue to the git people and they acknowledge it, but no one has fixed it. Git's merge strategy does not handle the case of a file splitting. When git tries to merge this one-liner into the next patch that splits the files, it does the merge wrong which then messes up the entire patch stack. -- Jon Smirl jonsmirl@xxxxxxxxx _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
