Hi Leon, Today's linux-next merge of the rdma-leon tree got conflicts in:
drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/mlx5/mlx5_ib.h drivers/infiniband/hw/mlx5/mr.c drivers/infiniband/hw/mlx5/qp.c drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/ethernet/mellanox/mlx5/core/en_stats.h drivers/net/ethernet/mellanox/mlx5/core/eq.c drivers/net/ethernet/mellanox/mlx5/core/main.c include/linux/mlx5/device.h include/linux/mlx5/driver.h include/linux/mlx5/mlx5_ifc.h between commits in the rdma-leon tree and commits (several of whitch are the same, or similar, patches) in the net-next tree. I just dropped the rdma-leon tree for today. Please clean it up. -- Cheers, Stephen Rothwell
