Subject: Re: linux-next: Tree for Jun 5 (amd64_edac)

From: Mauro Carvalho Chehab <[email-masked]>
Date: Tue, 05 Jun 2012 14:24:19 -0300

Em 05-06-2012 14:17, Borislav Petkov escreveu:
> On Tue, Jun 05, 2012 at 09:26:39AM -0700, Randy Dunlap wrote:
>> On 06/04/2012 08:30 PM, Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> There will be no linux-next release tomorrow.
>>>
>>> Changes since 20120604:
>>
>>
>>
>> on x86_64:
>>
>> drivers/edac/amd64_edac_inj.o: In function `amd64_remove_sysfs_dbg_files':
>> amd64_edac_inj.c:(.text+0x420): multiple definition of `amd64_remove_sysfs_dbg_files'
>> drivers/edac/amd64_edac.o:amd64_edac.c:(.text+0x3d60): first defined here
>> make[3]: *** [drivers/edac/amd64_edac_mod.o] Error 1
> 
> Doesn't trigger on latest linus. But Mauro has a bunch of patches
> touching these parts, can you try reverting if it is in linux-next, the
> one below:
> 
> commit faf20d4e226c53a963c384d36d8aa82c77be6dfb
> Author: Mauro Carvalho Chehab <[email-masked]>
> Date:   Wed Mar 21 14:00:44 2012 -0300
> 
>     amd64_edac: convert sysfs logic to use struct device
>     
>     Now that the EDAC core supports struct device, there's no sense
>     on having any logic at the EDAC core to simulate it. So, instead
>     of adding such logic there, change the logic at amd64_edac to
>     use it.
>     
>     Reviewed-by: Aristeu Rozanski <[email-masked]>
>     Cc: Doug Thompson <[email-masked]>
>     Cc: Borislav Petkov <[email-masked]>
>     Signed-off-by: Mauro Carvalho Chehab <[email-masked]>
> 
> Thanks.
> 

It is probably just a Kconfig issue. I'll prepare a patch fixing it,
posting it soon.

Thanks,
Mauro