From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: Re: linux-next: build failure after merge of the tip tree Date: Tue, 29 Jul 2014 20:10:30 -0700 Message-ID: <53D86226.7020207@linaro.org> References: <20140725144522.32c1f6b5@canb.auug.org.au> <20140730095642.5f68e01d@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pd0-f176.google.com ([209.85.192.176]:34455 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754999AbaG3DKd (ORCPT ); Tue, 29 Jul 2014 23:10:33 -0400 Received: by mail-pd0-f176.google.com with SMTP id y10so681653pdj.7 for ; Tue, 29 Jul 2014 20:10:33 -0700 (PDT) In-Reply-To: <20140730095642.5f68e01d@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On 07/29/2014 04:56 PM, Stephen Rothwell wrote: > Hi all, > > On Fri, 25 Jul 2014 14:45:22 +1000 Stephen Rothwell wrote: >> >> Hi all, >> >> After merging the tip tree, today's linux-next build (powerpc >> ppc64_defconfig) failed like this: >> >> arch/powerpc/kernel/time.c:743:6: error: conflicting types for 'update_vsyscall_old' >> void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm, >> ^ >> In file included from arch/powerpc/kernel/time.c:77:0: >> include/linux/timekeeper_internal.h:114:13: note: previous declaration of 'update_vsyscall_old' was here >> extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm, >> ^ >> >> Caused by commit 4a0e637738f0 ("clocksource: Get rid of cycle_last"). >> >> I have used the tip tree from next-20140724 for today. > > Ping? So I sent a fix for this the other day ([PATCH] timekeeping: Fixup typo in update_vsyscall_old definition), but I've not heard anything from anyone on it. thanks -john