* Stephen Rothwell [off-list ref] wrote:

Hi Ingo,

On Thu, 18 Oct 2012 20:29:53 +0200 Ingo Molnar [off-list ref] wrote:

quoted

* Stephen Rothwell [off-list ref] wrote:

quoted

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