* Gerald Schaefer <gerald.schaefer@xxxxxxxxxx> wrote: > On Thu, 18 Oct 2012 17:22:01 +1100 > Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > Hi all, > > > > 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? > > Subject: [PATCH] s390/thp: implement pmd_pgprot() for s390 Thanks Gerald! I'll merge this as well so that the semantic conflict disappears from linux-next. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
