Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755019Ab2FERQl (ORCPT ); Tue, 5 Jun 2012 13:16:41 -0400 Received: from s15943758.onlinehome-server.info ([217.160.130.188]:37620 "EHLO mail.x86-64.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751183Ab2FERQk (ORCPT ); Tue, 5 Jun 2012 13:16:40 -0400 Date: Tue, 5 Jun 2012 19:17:04 +0200 From: Borislav Petkov To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , Doug Thompson , Borislav Petkov , linux-edac@vger.kernel.org, Mauro Carvalho Chehab Subject: Re: linux-next: Tree for Jun 5 (amd64_edac) Message-ID: <20120605171704.GP13495@aftab.osrc.amd.com> References: <20120605133000.f2d21fb02881ef54a7bfe728@canb.auug.org.au> <4FCE333F.6060207@xenotime.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4FCE333F.6060207@xenotime.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1750 Lines: 54 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 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 Cc: Doug Thompson Cc: Borislav Petkov Signed-off-by: Mauro Carvalho Chehab 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/