[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20120314153106.0090c309e7503a7052f11ad0@canb.auug.org.au>
Date: Wed, 14 Mar 2012 15:31:06 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Srikar Dronamraju <srikar@...ux.vnet.ibm.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: build failure after merge of the uprobes tree
Hi Srikar,
After merging the uprobes tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/linux/compat.h:18:0,
from arch/x86/include/asm/ia32.h:7,
from arch/x86/include/asm/sigframe.h:17,
from arch/x86/kernel/asm-offsets.c:16:
arch/x86/include/asm/compat.h:238:20: error: redefinition of 'is_ia32_task'
arch/x86/include/asm/thread_info.h:272:20: note: previous definition of 'is_ia32_task' was here
Caused by commit 081c056eccf3 ("x86: Move is_ia32_task to
asm/thread_info.h from asm/compat.h") which added the function to
asm/thread_info.h but did not remove it from asm/compat.h. The version
of this patch that is in the tip tree is correct (but that is not in
tip's auto-latest branch (and hence linux-next) today).
I would have used the uprobes tree from next-20130309, but trying that
produced a large number of conflicts, so I just dropped the uprobes tree
for today.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists