From patchwork Fri Apr 28 04:31:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 756216 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wDgtH6LVPz9s8c for ; Fri, 28 Apr 2017 14:33:27 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="oGXtNNLg"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wDgtH4q6HzDqBP for ; Fri, 28 Apr 2017 14:33:27 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="oGXtNNLg"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wDgrD3Bx9zDqBP for ; Fri, 28 Apr 2017 14:31:40 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="oGXtNNLg"; 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 3wDgrC4QDXz9s8c; Fri, 28 Apr 2017 14:31:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1493353899; bh=OeCYtPrg+MhmgQLSrSO/5oLVUOl8eQtG/RuZ2Vqboic=; h=Date:From:To:Cc:Subject:From; b=oGXtNNLgr7iY04D9TlEoZQkEno3xOH2Vdr2bKWU7ekqfq8Oye9+KBvNzxHTfLEVfc H/XKp8g+QMdextGC7/qMWZ02nkxn/vCBhxwGj8yDCA+v4NO8kfLSdZrE5z8rVwuLzt 8/FCF8j0Qi9FaIpJ/JKmR9Fvwop+ReDHh0TFpYrdCLLnwuaME8sGkQxwmBQJ2jlH5r CQ8fqaPYdGn0lbzwVgYFHIftRBAnmlrvjep6ozAMp5FoUH6rHbr3cArdR5aT+8FaR1 FCvZOeuB/mSR02UQQcfMhXKq9pwBRJPJju/mpvcetDvS92JbADpKVuG8Qo2HXGedT9 +38zluOeQtzjA== Date: Fri, 28 Apr 2017 14:31:39 +1000 From: Stephen Rothwell To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Subject: linux-next: build failure after merge of the kvm-ppc tree Message-ID: <20170428143139.0eec043b@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-Next Mailing List , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi Paul, After merging the kvm-ppc tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: arch/powerpc/kvm/book3s_xive.c: In function 'xive_debugfs_init': arch/powerpc/kvm/book3s_xive.c:1852:52: error: 'powerpc_debugfs_root' undeclared (first use in this function) xive->dentry = debugfs_create_file(name, S_IRUGO, powerpc_debugfs_root, ^ Caused by commit 5af50993850a ("KVM: PPC: Book3S HV: Native usage of the XIVE interrupt controller") interacting with commit 7644d5819cf8 ("powerpc: Create asm/debugfs.h and move powerpc_debugfs_root there") from the powerpc tree. I have added the following merge fix patch. From: Stephen Rothwell Date: Fri, 28 Apr 2017 14:28:17 +1000 Subject: [PATCH] powerpc: merge fix for powerpc_debugfs_root move. Signed-off-by: Stephen Rothwell --- arch/powerpc/kvm/book3s_xive.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c index 7807ee17af4b..ffe1da95033a 100644 --- a/arch/powerpc/kvm/book3s_xive.c +++ b/arch/powerpc/kvm/book3s_xive.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include