From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: linux-next: build failure after merge of the akpm tree Date: Wed, 25 Sep 2013 14:43:28 -0700 Message-ID: <20130925144328.c679dc74178e78e188386b5a@linux-foundation.org> References: <20130925110643.db5fa154bea3838ed6affa45@canb.auug.org.au> <20130925132612.d1685bc8fb72558eef6fb09d@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:49794 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750814Ab3IYVn3 (ORCPT ); Wed, 25 Sep 2013 17:43:29 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Hugh Dickins Cc: Stephen Rothwell , Frederic Weisbecker , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sergei Trofimovich , Timur Tabi , Greg KH , ppc-dev 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? > (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.