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. Thank you.
