On Thu, Aug 19, 2010 at 3:36 PM, Timur Tabi <ti...@freescale.com> wrote: > Grant Likely wrote: >> On Thu, Aug 19, 2010 at 2:36 PM, Timur Tabi <ti...@freescale.com> wrote: >>> On Sun, Aug 1, 2010 at 2:57 AM, Grant Likely <grant.lik...@secretlab.ca> >>> wrote: >>> >>>> sound/soc/fsl/mpc8610_hpcd.c | 4 +- >>> >>> This file is/was significantly rewritten for 2.6.37. I posted a fix >>> to the alsa mailing list, but it will conflict with your patch. You >>> might want to remove all changes to sound/soc/fsl from this commit. >> >> This change is already in Linus' tree. > > Then I suspect the ALSA guys are going to have a merge conflict coming up, > because I had to make these changes to the -next branch.
It is a trivial conflict. They shouldn't have any problem fixing it up. g. -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
