From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-x230.google.com (mail-wg0-x230.google.com [IPv6:2a00:1450:400c:c00::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by ozlabs.org (Postfix) with ESMTPS id E2CDE2C007A for ; Wed, 2 Oct 2013 18:53:18 +1000 (EST) Received: by mail-wg0-f48.google.com with SMTP id n12so528714wgh.27 for ; Wed, 02 Oct 2013 01:53:13 -0700 (PDT) Date: Wed, 2 Oct 2013 10:53:11 +0200 From: Frederic Weisbecker To: Andrew Morton Subject: Re: linux-next: build failure after merge of the akpm tree Message-ID: <20131002085308.GA7941@localhost.localdomain> References: <20130925110643.db5fa154bea3838ed6affa45@canb.auug.org.au> <20130925132612.d1685bc8fb72558eef6fb09d@linux-foundation.org> <20130925144328.c679dc74178e78e188386b5a@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20130925144328.c679dc74178e78e188386b5a@linux-foundation.org> Cc: Stephen Rothwell , Greg KH , Hugh Dickins , linux-kernel@vger.kernel.org, Sergei Trofimovich , linux-next@vger.kernel.org, ppc-dev , Timur Tabi List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, Sep 25, 2013 at 02:43:28PM -0700, Andrew Morton wrote: > On Wed, 25 Sep 2013 14:32:14 -0700 (PDT) Hugh Dickins wrote: > > > On Wed, 25 Sep 2013, Andrew Morton wrote: > > > On Wed, 25 Sep 2013 11:06:43 +1000 Stephen Rothwell wrote: > > > > Hi Andrew, > > > > > > > > After merging the akpm tree, linux-next builds (powerpc allmodconfig) > > > > fail like this: > > > > > > I can't get powerpc to build at all at present: > > > > > > CHK include/config/kernel.release > > > CHK include/generated/uapi/linux/version.h > > > CHK include/generated/utsrelease.h > > > CC arch/powerpc/kernel/asm-offsets.s > > > In file included from include/linux/vtime.h:6, > > > from include/linux/hardirq.h:7, > > > from include/linux/memcontrol.h:24, > > > from include/linux/swap.h:8, > > > from include/linux/suspend.h:4, > > > from arch/powerpc/kernel/asm-offsets.c:24: > > > arch/powerpc/include/generated/asm/vtime.h:1:31: error: asm-generic/vtime.h: No such file or directory > > > > That caught me too: include/asm-generic/vtime.h is a patch-unfriendly > > 0-length file in the git tree; > > hm, this? > > > From: Andrew Morton > Subject: include/asm-generic/vtime.h: avoid zero-length file > > patch(1) can't handle zero-length files - it appears to simply not create > the file, so my powerpc build fails. > > Put something in here to make life easier. > > Cc: Hugh Dickins > Signed-off-by: Andrew Morton > --- > > include/asm-generic/vtime.h | 1 + > 1 file changed, 1 insertion(+) > > diff -puN /dev/null include/asm-generic/vtime.h > --- /dev/null > +++ a/include/asm-generic/vtime.h > @@ -0,0 +1 @@ > +/* no content, but patch(1) dislikes empty files */ > _ > > > > > I wonder what use it's supposed to have. > > Frederic, can you please confirm that include/asm-generic/vtime.h is > supposed to be empty? Yep. I use to let archs override some CPP symbols. And if they don't override these, they simply return the generic vtime.h file that is empty and as such doesn't override anything. May be that's an ugly way to handle this kind of override scenario but I couldn't find a better mechanism. Actually, a Kconfig symbol would do the trick. It just seemed to me like an overkill at that time. But it may be better. Thanks. > > > (And I'm not very keen on the growing trend for symlinks in the git tree.) > > ooh, that explains why I lost my arch/microblaze/boot/dts/system.dts.