linux-kernel - Re: [PATCH] of/device: Replace struct of_device with struct of

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <AANLkTiktjcwQrjBf1sF+2Y8ZTpmsTwo+-4cXfkkb5H+i@mail.gmail.com>
Date:	Thu, 19 Aug 2010 16:23:36 -0600
From:	Grant Likely <grant.likely@...retlab.ca>
To:	Timur Tabi <timur@...escale.com>
Cc:	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...mlogic.co.uk>, 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

On Thu, Aug 19, 2010 at 3:36 PM, Timur Tabi <timur@...escale.com> wrote:
> 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.

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/