From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: Re: linux-next: build failure after merge of the final tree (tip/s390 trees related) Date: Sat, 20 Oct 2012 00:43:45 +0200 Message-ID: <20121019224345.GC12658@gmail.com> References: <20121018172201.b81dcc8fe40868256f532364@canb.auug.org.au> <20121018182953.GA20658@gmail.com> <20121019140702.39b6e85901be2e39254b576a@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-we0-f174.google.com ([74.125.82.174]:46665 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755472Ab2JSWnw (ORCPT ); Fri, 19 Oct 2012 18:43:52 -0400 Content-Disposition: inline In-Reply-To: <20121019140702.39b6e85901be2e39254b576a@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Martin Schwidefsky , Heiko Carstens , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ralf Baechle , Andrew Morton * Stephen Rothwell wrote: > Hi Ingo, > > On Thu, 18 Oct 2012 20:29:53 +0200 Ingo Molnar wrote: > > > > * Stephen Rothwell wrote: > > > > > > After merging the final tree, today's linux-next build (s390 allyesconfig) > > > failed like this: > > > > > > mm/huge_memory.c:1424:2: error: implicit declaration of function 'pmd_pgprot' [-Werror=implicit-function-declaration] > > > mm/huge_memory.c:1424:7: error: incompatible types when assigning to type 'pgprot_t' from type 'int' > > > > > > (see http://kisskb.ellerman.id.au/kisskb/buildresult/7383823/) > > > > > > Caused by commit 35d3d3427314 ("s390/thp: select > > > HAVE_ARCH_TRANSPARENT_HUGEPAGE") from the s390 tree interacting with > > > commit 93c9d633bd9e ("mm/thp: Preserve pgprot across huge page split") > > > from the tip tree. > > > > > > N.B. Mips also selects HAVE_ARCH_TRANSPARENT_HUGEPAGE as of commit > > > e21a828a1bba ("MIPS: Transparent Huge Pages support") from the mips tree > > > and so will be broken in some configs now as well. > > > > > > Anyone have suggested merge fix patches I can apply? > > > > Resolved it for now by excluding those changes, will put them > > back in once they are fixed. > > It looks as though you have not gone back far enough - you > removed a couple of merges of sched/numa, but there are more. > I have two of the problems resolved with merge patches that > supply pmd_pgprot() for s390 and mips, but there is another > problem with mips (see Ralf's other email). Yeah. All of this should be resolved now in principle. Next time you'll integrate linux-next is on Monday, right? Thanks, Ingo