From patchwork Fri Jul 1 05:27:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 642823 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rglLm2jT0z9s8d for ; Fri, 1 Jul 2016 15:28:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=bDwSPgXI; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rglLm1csxzDqmv for ; Fri, 1 Jul 2016 15:28:32 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=bDwSPgXI; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rglK81Cj4zDql5 for ; Fri, 1 Jul 2016 15:27:08 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=bDwSPgXI; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3rglK76Crnz9s8d; Fri, 1 Jul 2016 15:27:07 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1467350827; bh=D1Vz23Jyp6BY6nPrqk0Cv9yQeJyPOW+J66Tb8YI0InU=; h=Date:From:To:Cc:Subject:From; b=bDwSPgXI5AmsQaYD8/Fl1/DGnIz7GNXBZh1SsR96skhGY27ZcGXW8nwzM0gqRBvpY 5agcZm0ayhhfcGVtO0M4safkM0Gu0cU+V+nwgtcXR0qQSkaykb4jpaton1VtpvKLGy U2ujp88POcMybGVu48gdQNiUEbr1QR/JtnVKTXSE= Date: Fri, 1 Jul 2016 15:27:07 +1000 From: Stephen Rothwell To: Michael Ellerman , Benjamin Herrenschmidt , Subject: linux-next: build failure after merge of the powerpc tree Message-ID: <20160701152707.444e03b4@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Colin Ian King , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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;