From: Colin Ian King <colin.king@canonical.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the powerpc tree
Date: Fri, 1 Jul 2016 09:59:07 +0100 [thread overview]
Message-ID: <577630DB.9070401@canonical.com> (raw)
In-Reply-To: <20160701152707.444e03b4@canb.auug.org.au>
On 01/07/16 06:27, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> arch/powerpc/kernel/fadump.c: In function 'fadump_invalidate_dump':
> arch/powerpc/kernel/fadump.c:1014:2: error: expected ';' before '}' token
> }
> ^
>
> Caused by commit
>
> 4a03749f140c ("powerpc/fadump: Trivial fix of spelling mistake, clean up message")
>
> I have added this fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 1 Jul 2016 15:19:34 +1000
> Subject: [PATCH] powerpc/fadump: add missing semicolon
>
> Fixes: 4a03749f140c ("powerpc/fadump: Trivial fix of spelling mistake, clean up message")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/kernel/fadump.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
> index f0664860753e..b3a663333d36 100644
> --- a/arch/powerpc/kernel/fadump.c
> +++ b/arch/powerpc/kernel/fadump.c
> @@ -1010,7 +1010,7 @@ static int fadump_invalidate_dump(struct fadump_mem_struct *fdm)
>
> if (rc) {
> pr_err("Failed to invalidate firmware-assisted dump registration. Unexpected error (%d).\n", rc);
> - return rc
> + return rc;
> }
> fw_dump.dump_active = 0;
> fdm_active = NULL;
>
Apologies for that. Thanks for fixing it up.
next prev parent reply other threads:[~2016-07-01 8:59 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 5:27 linux-next: build failure after merge of the powerpc tree Stephen Rothwell
2016-07-01 8:59 ` Colin Ian King [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-10 3:38 Stephen Rothwell
2023-02-12 23:22 ` Michael Ellerman
2021-04-19 9:14 Stephen Rothwell
2021-04-19 9:59 ` Xiongwei Song
2021-04-19 12:24 ` Michael Ellerman
2021-02-09 10:19 Stephen Rothwell
2021-02-10 8:20 ` Nicholas Piggin
2021-02-10 11:18 ` Stephen Rothwell
2020-04-22 5:41 Stephen Rothwell
2020-04-22 6:35 ` Haren Myneni
2020-04-25 23:52 ` Michael Ellerman
2019-09-30 0:13 Stephen Rothwell
2019-10-03 23:05 ` Michael Ellerman
2019-10-11 8:22 ` Michael Ellerman
2019-09-02 11:40 Stephen Rothwell
2019-09-02 11:52 ` Christoph Hellwig
2019-02-22 7:14 Stephen Rothwell
2019-02-22 7:37 ` Christophe Leroy
2019-02-22 11:28 ` Michael Ellerman
2018-03-29 7:43 Stephen Rothwell
2018-01-19 5:53 Stephen Rothwell
2018-01-18 22:26 Stephen Rothwell
2017-11-02 6:49 Stephen Rothwell
2017-11-14 11:12 ` Michael Ellerman
2016-11-22 8:58 Stephen Rothwell
2016-11-22 10:21 ` Stephen Rothwell
2016-11-23 2:02 ` Nicholas Piggin
2016-07-22 6:31 Stephen Rothwell
2016-01-07 8:16 Stephen Rothwell
2016-01-07 10:30 ` Michael Ellerman
2016-01-13 5:46 ` Aneesh Kumar K.V
2016-01-13 7:44 ` Michael Ellerman
2016-01-12 12:32 ` Michael Ellerman
2015-08-21 8:25 Stephen Rothwell
2015-08-21 8:59 ` Vasant Hegde
2015-08-21 23:40 ` Michael Ellerman
2015-08-22 4:09 ` Vasant Hegde
2015-08-22 11:16 ` Michael Ellerman
2014-08-06 6:31 Stephen Rothwell
2013-07-02 0:54 Stephen Rothwell
2013-07-02 2:00 ` Benjamin Herrenschmidt
2012-11-28 3:03 Stephen Rothwell
2012-11-28 4:28 ` Benjamin Herrenschmidt
2011-07-01 1:39 Stephen Rothwell
2011-07-01 3:00 ` Benjamin Herrenschmidt
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=577630DB.9070401@canonical.com \
--to=colin.king@canonical.com \
--cc=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=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).