On Fri, Jul 27, 2018 at 12:33:01PM +1000, Stephen Rothwell wrote: > I fixed it up (I wasn't sure how to fix this up as so much has changed > in the net-next tree and both modified functions had been (re)moved, > so I effectively reverted the rdma tree commit) and can carry the fix > as necessary. Please come to some arrangement about this. How does that still compile? We removed ib_query_gid() from the rdma tree and replaced it with rdma_get_gid_attr().. I think the merge resolution is going to be a bit nasty to absorb that much changing.. Perhaps we should add a compatability ib_query_gid back to the RDMA tree and then send DaveM a commit to fix SMC and remove it during the next cycle? Linus can resolve smc_ib.c by using the net version Does someone else have a better idea? Thanks, Jason -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
