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: <CAFCwf10NJNcivdX92_5Jk-fHOJ1L-VAEq=hfEh+1b2nSuK3D3A@mail.gmail.com>
Date:	Wed, 20 May 2015 09:01:14 +0300
From:	Oded Gabbay <oded.gabbay@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Dave Airlie <airlied@...ux.ie>, linux-next@...r.kernel.org,
	"Linux-Kernel@...r. Kernel. Org" <linux-kernel@...r.kernel.org>,
	Alex Deucher <alexander.deucher@....com>
Subject: Re: linux-next: build failure after merge of the drm tree

On Wed, May 20, 2015 at 8:31 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 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

Hi,
Did I need to do something different in order to prevent this conflict ?
Do some manual merge before sending the pull request ?

Thanks,
          Oded
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/