On Mon, 4 Nov 2024 10:27:10 +0200 Leon Romanovsky wrote: > Jakub, > > We applied this series to RDMA and first patch generates merge conflicts > in include/linux/mlx5/mlx5_ifc.h between netdev and RDMA trees. > > Can you please pull shared mlx5-next branch to avoid it? Sorry I don't have the context, the thread looks 2 months old. If you'd like us to pull something please sense a pull request targeting net-next...