On Sun, Dec 16, 2018 at 4:08 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> include/linux/mlx5/mlx5_ifc.h
>
> between commit:
>
> 663f146f2ecf ("net/mlx5: E-Switch, Fix fdb cap bits swap")
>
> from the net tree and commit:
>
> c74d
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
include/linux/mlx5/mlx5_ifc.h
between commit:
663f146f2ecf ("net/mlx5: E-Switch, Fix fdb cap bits swap")
from the net tree and commit:
c74d90c11c05 ("net/mlx5: Fix offsets of ifc reserved fields")
from the rdma tree.
On Mon, Jan 15, 2018 at 11:53:21AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/main.c
>
> between commits:
>
> 8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast
> traffic when needed
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
drivers/infiniband/hw/mlx5/main.c
between commits:
8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast traffic
when needed")
72f36be06138 ("net/mlx5: Fix mlx5_get_uars_page to return error code")
from
