mirror of
https://gitee.com/openharmony/kernel_linux
synced 2025-05-28 18:16:56 +00:00

Some overlapping changes in the mlx5 driver. A merge conflict resolution posted by Stephen Rothwell was used as a guide. Signed-off-by: David S. Miller <davem@davemloft.net>