Hi Doug,
Today's linux-next merge of the rdma tree got conflicts in:
drivers/net/ethernet/mellanox/mlx5/core/vport.c
include/linux/mlx5/mlx5_ifc.h
include/linux/mlx5/vport.h
between commits:
e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC
address")
e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport
state")
from the net-next tree and commit:
e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query
function")
from the rdma tree and maybe some others.
I have no hope of fixing this stuff up, so I have dropped the rdma tree
again for today. There is similar functionality being introduced in
both trees ... please sort this mess out ...
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
