From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the powerpc tree Date: Fri, 1 Jul 2016 15:27:07 +1000 Message-ID: <20160701152707.444e03b4@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:46579 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673AbcGAF2B (ORCPT ); Fri, 1 Jul 2016 01:28:01 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Michael Ellerman , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Colin Ian King 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 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 --- 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; -- 2.8.1 -- Cheers, Stephen Rothwell