lkml.org 
[lkml]   [2015]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build failure after merge of the drm tree
Hi Dave,

On Wed, 20 May 2015 05:41:46 +0100 (IST) Dave Airlie <airlied@linux.ie> wrote:
>
> > 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.

Yep, against commit 79b066bd76d5 ("drm/amdkfd: Initialize sdma vm when
creating sdma queue") which is in v4.1-rc3.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-05-20 07:41    [W:0.142 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site