From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Subject: Re: linux-next: Tree for July 26 (uml) Date: Tue, 14 Aug 2012 09:43:38 +0930 Message-ID: <87a9xys53h.fsf@rustcorp.com.au> References: <20120726150419.0de645e8750e3a15fa0f1aaa@canb.auug.org.au> <50115FCF.4060708@xenotime.net> <502932A0.3060001@xenotime.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from ozlabs.org ([203.10.76.45]:37080 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753901Ab2HNAXE (ORCPT ); Mon, 13 Aug 2012 20:23:04 -0400 In-Reply-To: <502932A0.3060001@xenotime.net> Sender: linux-next-owner@vger.kernel.org List-ID: To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , Richard Weinberger , user-mode-linux-devel@lists.sourceforge.net, David Howells On Mon, 13 Aug 2012 10:00:16 -0700, Randy Dunlap wrote: > On 07/26/2012 08:18 AM, Randy Dunlap wrote: > > > On 07/25/2012 10:04 PM, Stephen Rothwell wrote: > > > >> Hi all, > >> > >> Please do not add anything to linux-next included branches/series that is > >> destined for v3.7 until after v3.6-rc1 is released. > >> > >> Reminder: do not rebase your branches before asking Linus to pull them ... > >> > >> Changes since 20120725: > >> > > > > > > > > uml on x86_64 (defconfig) build fails with: > > > > CC arch/x86/um/../kernel/module.o > > arch/x86/um/../kernel/module.c:96:5: error: redefinition of 'apply_relocate_add' > > include/linux/moduleloader.h:64:19: note: previous definition of 'apply_relocate_add' was here > > make[2]: *** [arch/x86/um/../kernel/module.o] Error 1 > > > > > > > > > > Adding Rusty. > > > This build error is still happening for uml on x86_64 > in linux-next 20120813. No huge surprise, I'll punt this to David Howells :) Cheers, Rusty.