All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Ralf Baechle <ralf@linux-mips.org>
Subject: Re: linux-next: build failure after merge of the final tree (tip/s390 trees related)
Date: Thu, 18 Oct 2012 20:29:53 +0200	[thread overview]
Message-ID: <20121018182953.GA20658@gmail.com> (raw)
In-Reply-To: <20121018172201.b81dcc8fe40868256f532364@canb.auug.org.au>


* Stephen Rothwell <sfr@canb.auug.org.au> 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?

Resolved it for now by excluding those changes, will put them 
back in once they are fixed.

Thanks,

	Ingo


  parent reply	other threads:[~2012-10-18 18:30 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-18  6:22 linux-next: build failure after merge of the final tree (tip/s390 trees related) Stephen Rothwell
2012-10-18 14:51 ` Ralf Baechle
2012-10-19  2:56   ` Stephen Rothwell
2012-10-19 21:48   ` Ingo Molnar
2012-10-20  1:07   ` [tip:numa/core] MIPS/thp: Add pmd_pgprot() implementation tip-bot for Ralf Baechle
2012-10-20  1:08   ` [tip:numa/core] MIPS/thp: Fix update_mmu_cache() cache call tip-bot for Ingo Molnar
2012-10-18 15:02 ` linux-next: build failure after merge of the final tree (tip/s390 trees related) Ralf Baechle
2012-10-19 21:52   ` Peter Zijlstra
2012-10-19 22:36     ` Ingo Molnar
2012-10-19 22:39     ` Ingo Molnar
2012-10-20  2:31       ` Stephen Rothwell
2012-10-18 16:26 ` Gerald Schaefer
2012-10-19  2:57   ` Stephen Rothwell
2012-10-19 21:37   ` Ingo Molnar
2012-10-20  1:06   ` [tip:numa/core] s390/thp: implement pmd_pgprot() for s390 tip-bot for Gerald Schaefer
2012-10-28 13:10   ` [PATCH] s390: Add pmd_mknotpresent() Ingo Molnar
2012-10-28 17:16     ` [tip:numa/core] sched, numa, mm, s390/thp: " tip-bot for Ingo Molnar
2012-10-29  7:49     ` [PATCH] s390: " Martin Schwidefsky
2012-10-29 11:05       ` Ingo Molnar
2012-10-29 11:30         ` Martin Schwidefsky
2012-10-29 14:00     ` Gerald Schaefer
2012-10-30  7:25       ` Ingo Molnar
2012-10-18 18:29 ` Ingo Molnar [this message]
2012-10-19  3:07   ` linux-next: build failure after merge of the final tree (tip/s390 trees related) Stephen Rothwell
2012-10-19 22:43     ` Ingo Molnar
2012-10-20  2:32       ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121018182953.GA20658@gmail.com \
    --to=mingo@kernel.org \
    --cc=heiko.carstens@de.ibm.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=ralf@linux-mips.org \
    --cc=schwidefsky@de.ibm.com \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.