From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: Re: linux-next: build failure after merge of the drm tree Date: Wed, 20 May 2015 05:41:46 +0100 (IST) Message-ID: References: <20150520130828.4fdacf54@canb.auug.org.au> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: In-Reply-To: <20150520130828.4fdacf54@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Oded Gabbay , Alex Deucher List-Id: linux-next.vger.kernel.org > 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.