Messages in this thread | | | From | Grant Likely <> | Date | Thu, 19 Aug 2010 16:23:36 -0600 | Subject | Re: [PATCH] of/device: Replace struct of_device with struct of_platform |
| |
On Thu, Aug 19, 2010 at 3:36 PM, Timur Tabi <timur@freescale.com> wrote: > Grant Likely wrote: >> On Thu, Aug 19, 2010 at 2:36 PM, Timur Tabi <timur@freescale.com> wrote: >>> On Sun, Aug 1, 2010 at 2:57 AM, Grant Likely <grant.likely@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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |