[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4C6DA3E7.20206@freescale.com>
Date: Thu, 19 Aug 2010 16:36:39 -0500
From: Timur Tabi <timur@...escale.com>
To: Grant Likely <grant.likely@...retlab.ca>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Liam Girdwood <lrg@...mlogic.co.uk>
CC: sfr@...b.auug.org.au, monstr@...str.eu,
microblaze-uclinux@...e.uq.edu.au,
devicetree-discuss@...ts.ozlabs.org, linux-kernel@...r.kernel.org,
linuxppc-dev@...abs.org, benh@...nel.crashing.org,
sparclinux@...r.kernel.org, davem@...emloft.net,
alsa-devel mailing list <alsa-devel@...a-project.org>
Subject: Re: [PATCH] of/device: Replace struct of_device with struct of_platform
Grant Likely wrote:
> On Thu, Aug 19, 2010 at 2:36 PM, Timur Tabi <timur@...escale.com> wrote:
>> On Sun, Aug 1, 2010 at 2:57 AM, Grant Likely <grant.likely@...retlab.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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists