History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Three trivial overlapping conflicts.

David S. Miller committed 7 years ago

Commit ff24e492 parents 26f146e ea98667167 files · +1373 −725Browse files

Showing the changes to include/uapi (1 of 167 files). Show all

Unified · Split

include/uapi/rdma/mlx5-abi.h+1−0
@@ -238,6 +238,7 @@ enum mlx5_ib_query_dev_resp_flags { · 237 unmodified lines
238238 MLX5_IB_QUERY_DEV_RESP_FLAGS_CQE_128B_COMP = 1 << 0,
239239 MLX5_IB_QUERY_DEV_RESP_FLAGS_CQE_128B_PAD = 1 << 1,
240240 MLX5_IB_QUERY_DEV_RESP_PACKET_BASED_CREDIT_MODE = 1 << 2,
241+ MLX5_IB_QUERY_DEV_RESP_FLAGS_SCAT2CQE_DCT = 1 << 3,
241242 };
242243
243244 enum mlx5_ib_tunnel_offloads {