mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
c0fe82baae
To resolve minor conflict in:
drivers/infiniband/hw/mlx5/mlx5_ib.h
By merging both hunks.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>