From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423807AbdD1Eb5 (ORCPT ); Fri, 28 Apr 2017 00:31:57 -0400 Received: from ozlabs.org ([103.22.144.67]:59275 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164489AbdD1Ebr (ORCPT ); Fri, 28 Apr 2017 00:31:47 -0400 Date: Fri, 28 Apr 2017 14:31:39 +1000 From: Stephen Rothwell To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: linux-next: build failure after merge of the kvm-ppc tree Message-ID: <20170428143139.0eec043b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -- 2.11.0 -- Cheers, Stephen Rothwell