Three trivial overlapping conflicts.
Showing the changes to include/uapi (1 of 167 files). Show all
Unified · Split
| @@ -238,6 +238,7 @@ enum mlx5_ib_query_dev_resp_flags { · 237 unmodified lines | |||
| 238 | MLX5_IB_QUERY_DEV_RESP_FLAGS_CQE_128B_COMP = 1 << 0, | 238 | MLX5_IB_QUERY_DEV_RESP_FLAGS_CQE_128B_COMP = 1 << 0, |
| 239 | MLX5_IB_QUERY_DEV_RESP_FLAGS_CQE_128B_PAD = 1 << 1, | 239 | MLX5_IB_QUERY_DEV_RESP_FLAGS_CQE_128B_PAD = 1 << 1, |
| 240 | MLX5_IB_QUERY_DEV_RESP_PACKET_BASED_CREDIT_MODE = 1 << 2, | 240 | MLX5_IB_QUERY_DEV_RESP_PACKET_BASED_CREDIT_MODE = 1 << 2, |
| 241 | MLX5_IB_QUERY_DEV_RESP_FLAGS_SCAT2CQE_DCT = 1 << 3, | ||
| 241 | }; | 242 | }; |
| 242 | 243 | ||
| 243 | enum mlx5_ib_tunnel_offloads { | 244 | enum mlx5_ib_tunnel_offloads { |