From: Timur Tabi <timur@freescale.com>
To: Grant Likely <grant.likely@secretlab.ca>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Cc: sfr@canb.auug.org.au, monstr@monstr.eu,
microblaze-uclinux@itee.uq.edu.au,
devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org,
benh@kernel.crashing.org, sparclinux@vger.kernel.org,
davem@davemloft.net,
alsa-devel mailing list <alsa-devel@alsa-project.org>
Subject: Re: [PATCH] of/device: Replace struct of_device with struct of_platform
Date: Thu, 19 Aug 2010 16:36:39 -0500 [thread overview]
Message-ID: <4C6DA3E7.20206@freescale.com> (raw)
In-Reply-To: <AANLkTi=12oe7hquDJ4NN_S=cFdfndfxxkOmzqPziD2CE@mail.gmail.com>
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.
WARNING: multiple messages have this Message-ID (diff)
From: Timur Tabi <timur@freescale.com>
To: Grant Likely <grant.likely@secretlab.ca>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Cc: sfr@canb.auug.org.au, monstr@monstr.eu,
alsa-devel mailing list <alsa-devel@alsa-project.org>,
microblaze-uclinux@itee.uq.edu.au,
devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org,
sparclinux@vger.kernel.org, davem@davemloft.net
Subject: Re: [PATCH] of/device: Replace struct of_device with struct of_platform
Date: Thu, 19 Aug 2010 16:36:39 -0500 [thread overview]
Message-ID: <4C6DA3E7.20206@freescale.com> (raw)
In-Reply-To: <AANLkTi=12oe7hquDJ4NN_S=cFdfndfxxkOmzqPziD2CE@mail.gmail.com>
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.
WARNING: multiple messages have this Message-ID (diff)
From: Timur Tabi <timur@freescale.com>
To: Grant Likely <grant.likely@secretlab.ca>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Cc: sfr@canb.auug.org.au, monstr@monstr.eu,
microblaze-uclinux@itee.uq.edu.au,
devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org,
benh@kernel.crashing.org, sparclinux@vger.kernel.org,
davem@davemloft.net,
alsa-devel mailing list <alsa-devel@alsa-project.org>
Subject: Re: [PATCH] of/device: Replace struct of_device with struct of_platform
Date: Thu, 19 Aug 2010 21:36:39 +0000 [thread overview]
Message-ID: <4C6DA3E7.20206@freescale.com> (raw)
In-Reply-To: <AANLkTi=12oe7hquDJ4NN_S=cFdfndfxxkOmzqPziD2CE@mail.gmail.com>
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.
next prev parent reply other threads:[~2010-08-19 21:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-01 7:57 [PATCH] of/device: Replace struct of_device with struct of_platform Grant Likely
2010-08-01 7:57 ` Grant Likely
2010-08-01 7:57 ` Grant Likely
2010-08-01 8:05 ` David Miller
2010-08-01 8:05 ` David Miller
2010-08-01 8:05 ` [PATCH] of/device: Replace struct of_device with struct David Miller
2010-08-01 8:08 ` [PATCH] of/device: Replace struct of_device with struct of_platform Grant Likely
2010-08-01 8:08 ` Grant Likely
2010-08-01 8:08 ` Grant Likely
2010-08-01 8:08 ` [PATCH] of/device: Replace struct of_device with struct Grant Likely
2010-08-19 20:36 ` [PATCH] of/device: Replace struct of_device with struct of_platform Timur Tabi
2010-08-19 20:36 ` Timur Tabi
2010-08-19 20:36 ` Timur Tabi
2010-08-19 20:36 ` Timur Tabi
2010-08-19 21:32 ` Grant Likely
2010-08-19 21:32 ` Grant Likely
2010-08-19 21:32 ` Grant Likely
2010-08-19 21:32 ` Grant Likely
2010-08-19 21:36 ` Timur Tabi [this message]
2010-08-19 21:36 ` Timur Tabi
2010-08-19 21:36 ` Timur Tabi
2010-08-19 22:23 ` Grant Likely
2010-08-19 22:23 ` Grant Likely
2010-08-19 22:23 ` Grant Likely
2010-08-19 22:23 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C6DA3E7.20206@freescale.com \
--to=timur@freescale.com \
--cc=alsa-devel@alsa-project.org \
--cc=benh@kernel.crashing.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=davem@davemloft.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=lrg@slimlogic.co.uk \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=monstr@monstr.eu \
--cc=sfr@canb.auug.org.au \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.