From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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) 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 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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