On Fri, Mar 23, 2018 at 11:40:59AM -0400, David Miller wrote: > > This merge was a little bit more hectic than usual. > > But thankfully, I had some sample conflict resolutions to work > with, in particular for the mlx5 infiniband changes which were > the most difficult to resolve. > > Please double check my work and provide any fixup patches if > necessary.
The drivers/infiniband looks OK, and I also checked that merging netdev and rdma together gets us to the right result. Jason
