Re: linux-next: manual merge of the net-next tree with the rdma tree

[Jason Gunthorpe]

On Fri, May 08, 2020 at 01:18:51PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/net/bonding/bond_main.c
> 
> between commits:
> 
>   ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves")
>   c071d91d2a89 ("bonding: Add helper function to get the xmit slave based on hash")
>   29d5bbccb3a1 ("bonding: Add helper function to get the xmit slave in rr mode")
> 
> from the rdma and mlx5-next trees and commit:
> 
>   ae46f184bc1f ("bonding: propagate transmit status")
> 
> from the net-next tree.

Saeed? These patches in the shared branch were supposed to be a PR to
net-net? I see it hasn't happened yet and now we have conflicts?? 

Jason