From patchwork Wed Sep 25 21:43:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 278028 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 571702C03E2 for ; Thu, 26 Sep 2013 07:43:57 +1000 (EST) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by ozlabs.org (Postfix) with ESMTP id 82E962C00AD for ; Thu, 26 Sep 2013 07:43:30 +1000 (EST) Received: from akpm3.mtv.corp.google.com (unknown [216.239.45.95]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id B83BE3C6; Wed, 25 Sep 2013 21:43:28 +0000 (UTC) Date: Wed, 25 Sep 2013 14:43:28 -0700 From: Andrew Morton To: Hugh Dickins Subject: Re: linux-next: build failure after merge of the akpm tree Message-Id: <20130925144328.c679dc74178e78e188386b5a@linux-foundation.org> In-Reply-To: References: <20130925110643.db5fa154bea3838ed6affa45@canb.auug.org.au> <20130925132612.d1685bc8fb72558eef6fb09d@linux-foundation.org> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Cc: Stephen Rothwell , Frederic Weisbecker , linux-kernel@vger.kernel.org, Sergei Trofimovich , linux-next@vger.kernel.org, Greg KH , ppc-dev , Timur Tabi X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-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 */