Hi Doug and Dave, In the absence of linux-next, I want to warn you that there is a trivial merge conflict between rdma-next and net-next in drivers/net/ethernet/mellanox/mlx4/catas.c
The origin of the merge conflict is the following patch https://patchwork.kernel.org/patch/9986131/ applied to rdma-next. It is part of tree-wide conversion to timer_setup() interface. Thanks
signature.asc
Description: PGP signature
