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

From: Borislav Petkov
Date: Tue Jun 05 2012 - 13:16:34 EST


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 <mchehab@xxxxxxxxxx>
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 <arozansk@xxxxxxxxxx>
Cc: Doug Thompson <norsk5@xxxxxxxxx>
Cc: Borislav Petkov <borislav.petkov@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

Thanks.

--
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/