linux-kernel - Re: linux-next: build failure after merge of the drm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150520153102.3e70a45c@canb.auug.org.au>
Date:	Wed, 20 May 2015 15:31:02 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dave Airlie <airlied@...ux.ie>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Oded Gabbay <oded.gabbay@...il.com>,
	Alex Deucher <alexander.deucher@....com>
Subject: Re: linux-next: build failure after merge of the drm tree

Hi Dave,

On Wed, 20 May 2015 15:25:38 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Wed, 20 May 2015 05:41:46 +0100 (IST) Dave Airlie <airlied@...ux.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.

So you could, of course, just merge that commit instead of Linus'
tree ...

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped