Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752289AbbETEl6 (ORCPT ); Wed, 20 May 2015 00:41:58 -0400 Received: from gir.skynet.ie ([193.1.99.77]:58094 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237AbbETElx (ORCPT ); Wed, 20 May 2015 00:41:53 -0400 Date: Wed, 20 May 2015 05:41:46 +0100 (IST) From: Dave Airlie X-X-Sender: airlied@skynet.skynet.ie To: Stephen Rothwell cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Oded Gabbay , Alex Deucher Subject: Re: linux-next: build failure after merge of the drm tree In-Reply-To: <20150520130828.4fdacf54@canb.auug.org.au> Message-ID: References: <20150520130828.4fdacf54@canb.auug.org.au> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 918 Lines: 25 > Hi Dave, > > After merging the drm tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c: In function 'create_queue_cpsch': > drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:888:2: error: implicit declaration of function 'init_sdma_vm' [-Werror=implicit-function-declaration] > init_sdma_vm(dqm, q, qpd); > ^ > > Caused by commit 3e3f6e1a90a8 ("drm/amdkfd: make the sdma vm init to be > asic specific"). > > I have used the drm tree from next-20150519 for today. Okay this looks like a silent conflict, I'll have to pull Linus tree into drm-next and fix it up there. Dave. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/