From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michael Ellerman <mpe@ellerman.id.au>,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Neelesh Gupta <neelegup@linux.vnet.ibm.com>
Subject: Re: linux-next: build failure after merge of the powerpc-mpe tree
Date: Thu, 26 Mar 2015 13:35:46 +1100 [thread overview]
Message-ID: <1427337346.6468.105.camel@kernel.crashing.org> (raw)
In-Reply-To: <20150326132948.3feecd0c@canb.auug.org.au>
On Thu, 2015-03-26 at 13:29 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc-mpe tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
>
> In file included from arch/powerpc/platforms/powernv/setup.c:36:0:
> arch/powerpc/include/asm/opal.h:214:17: error: 'enum OpalMessageType' declared inside parameter list [-Werror]
> struct notifier_block *nb);
> ^
>
> Caused by commit d7cf83fcaf1b ("powerpc/powernv: Move opal-api.h closer
> to the Skiboot version") interacting with commit b921e90260ce
> ("powerpc/powernv: Add OPAL message notifier unregister function") from
> the powerpc tree.
>
> I have added the following merge fix patch:
Michael, you can pull my next-misc branch and apply this fix to the
merge commit to avoid bisection breakage.
Cheers,
Ben.
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 26 Mar 2015 13:25:58 +1100
> Subject: [PATCH] powerpc/powernv: fix for OpalMessageType name change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/include/asm/opal.h | 2 +-
> arch/powerpc/platforms/powernv/opal.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
> index d430ec7e60c6..c08de77f398a 100644
> --- a/arch/powerpc/include/asm/opal.h
> +++ b/arch/powerpc/include/asm/opal.h
> @@ -210,7 +210,7 @@ extern int opal_notifier_unregister(struct notifier_block *nb);
>
> extern int opal_message_notifier_register(enum opal_msg_type msg_type,
> struct notifier_block *nb);
> -extern int opal_message_notifier_unregister(enum OpalMessageType msg_type,
> +extern int opal_message_notifier_unregister(enum opal_msg_type msg_type,
> struct notifier_block *nb);
> extern void opal_notifier_enable(void);
> extern void opal_notifier_disable(void);
> diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
> index 2c590e69a928..d403b2b08626 100644
> --- a/arch/powerpc/platforms/powernv/opal.c
> +++ b/arch/powerpc/platforms/powernv/opal.c
> @@ -318,7 +318,7 @@ int opal_message_notifier_register(enum opal_msg_type msg_type,
> &opal_msg_notifier_head[msg_type], nb);
> }
>
> -int opal_message_notifier_unregister(enum OpalMessageType msg_type,
> +int opal_message_notifier_unregister(enum opal_msg_type msg_type,
> struct notifier_block *nb)
> {
> return atomic_notifier_chain_unregister(
> --
> 2.1.4
>
next prev parent reply other threads:[~2015-03-26 2:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-26 2:29 linux-next: build failure after merge of the powerpc-mpe tree Stephen Rothwell
2015-03-26 2:35 ` Benjamin Herrenschmidt [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-04-10 10:02 Stephen Rothwell
2015-04-11 10:39 ` Michael Ellerman
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=1427337346.6468.105.camel@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=neelegup@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).