[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 8 Aug 2016 19:30:57 -0400
From: Doug Ledford <dledford@...hat.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Linus Torvalds <torvalds@...ux-foundation.org>,
Moni Shoua <monis@...lanox.com>,
Kamal Heib <kamalh@...lanox.com>,
Amir Vadai <amirv@...lanox.com>,
Haggai Eran <haggaie@...lanox.com>,
Leon Romanovsky <leon@...nel.org>
Subject: Re: linux-next: build failure after merge of Linus' tree
On 8/8/2016 5:53 PM, Stephen Rothwell wrote:
> Hi Doug,
>
> On Mon, 8 Aug 2016 11:37:33 -0400 Doug Ledford <dledford@...hat.com> wrote:
>>
>> On 8/7/2016 9:58 PM, Stephen Rothwell wrote:
>>>
>>> With Linus' tree, today's linux-next build (powerpc allyesconfig) failed
>>> like this:
>>>
>>> drivers/infiniband/sw/built-in.o:(.opd+0x1698): multiple definition of `copy_data'
>>> drivers/infiniband/hw/built-in.o:(.opd+0xe5f8): first defined here
>>> drivers/infiniband/sw/built-in.o:(.opd+0x1320): multiple definition of `rxe_av_from_attr'
>>> drivers/infiniband/hw/built-in.o:(.opd+0xe280): first defined here
>>
>> This looks very suspicious. I think you are picking up two copies of
>> the rxe code. One from Linus tree and one from probably Leon's tree.
>
> Actually the second copy is from your tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next),
> Leon's trees are empty (relative to Linus' tree). I guess when you
> rebased and squashed things, you forgot to reset your for-next tag, so
> I got the old version of your tree as well as the rebased version via
> Linus' tree.
>
Doh! My apologies, that would certainly explain it. I'll reset my
for-next tag.
--
Doug Ledford <dledford@...hat.com>
GPG Key ID: 0E572FDD
Download attachment "signature.asc" of type "application/pgp-signature" (885 bytes)
Powered by blists - more mailing lists