Re: linux-next: build failure after merge of the rdma-leon tree

[Doug Ledford <dledford@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 2328 bytes --]

On 05/12/2016 08:08 PM, Stephen Rothwell wrote:
> Hi Leon,
> 
> After merging the rdma-leon tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: ".rdma_addr_size" [drivers/infiniband/core/rdma_ucm.ko] undefined!
> ERROR: ".rdma_addr_register_client" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_addr_size" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_addr_unregister_client" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_translate_ip" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_copy_addr" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_resolve_ip" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_addr_cancel" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_resolve_ip_route" [drivers/infiniband/core/ib_sa.ko] undefined!
> ERROR: ".addr_init" [drivers/infiniband/core/ib_core.ko] undefined!
> ERROR: ".rdma_addr_find_l2_eth_by_grh" [drivers/infiniband/core/ib_core.ko] undefined!
> ERROR: ".addr_cleanup" [drivers/infiniband/core/ib_core.ko] undefined!
> 
> I don't know what has caused this,

This was, I think, a botched merge between a fix in Leon's
topic/fix-core and topic/rdma-rw-api, but I could be wrong.

> but the rdma-leon tree shares a lot
> of patches (but not commits) with the rdma tree and so needs to be
> cleaned up. Please sort out your work flow.

This is an entirely separate issue.  Leon based all of his topic
branches on Linus' 4.6-rc7.  Even though I already have my initial
for-next tag available (it's based on 4.6-rc6 + my k.o/for-4.6-rc branch
to pick up a few commits that were after 4.6-rc6) and it has a number of
already commited for 4.7 patches on it.  He then committed a bunch of
those same patches in his topic branches and then merged them together
to make the branch you pulled.  That is an entirely broken workflow.  He
must base his topic branches, and his final branch, on my for-next tag
and that way exclude the patches I've already taken from the ones he is
testing.  I'm not sure he's aware of that, but as of this email, he
certainly is now.

> I have dropped the rdma-leon tree for today.
> 


-- 
Doug Ledford <dledford@redhat.com>
              GPG KeyID: 0E572FDD



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]