On Tue, Nov 08, 2016 at 01:06:23PM +1100, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the rdma-leon-test tree got a conflict in:
>
> drivers/infiniband/core/roce_gid_mgmt.c
>
> between commit:
>
> 453d39329ad0 ("IB/core: Flip to the new dev walk API")
>
> from the net-nex
Hi Leon,
Today's linux-next merge of the rdma-leon-test tree got a conflict in:
drivers/infiniband/core/roce_gid_mgmt.c
between commit:
453d39329ad0 ("IB/core: Flip to the new dev walk API")
from the net-next tree and commit:
e4b4d6b5d8c2 ("IB/core: Remove debug prints after allocation
