On Mon, Sep 24, 2012 at 09:23:25PM -0600, Alex Williamson wrote: > On Mon, 2012-09-24 at 15:02 -0700, Randy Dunlap wrote: > > On 09/24/2012 07:53 AM, Stephen Rothwell wrote: > > > > > Hi all, > > > > > > Today was a train wreck, with lots of new conflicts across several trees > > > and a few build failures as well. > > > > > > Changes since 201209021: > > > > > > > > > > > on i386: > > > > drivers/built-in.o: In function `iommu_group_remove_device': > > (.text+0x74cb10): multiple definition of `iommu_group_remove_device' > > arch/x86/built-in.o:(.text+0x140d0): first defined here > ... > > > Here's a patch to get it past this. It still doesn't fully build, but > the rest isn't iommu related. Thanks, Applied, thanks. -- AMD Operating System Research Center Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach General Managers: Alberto Bozzo Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html