Commit e8094e66 authored by Roland Dreier's avatar Roland Dreier

Merge branch 'cma' into for-next

parents 17a55f79 cf4f7e8c
...@@ -67,7 +67,6 @@ enum rdma_port_space { ...@@ -67,7 +67,6 @@ enum rdma_port_space {
RDMA_PS_IPOIB = 0x0002, RDMA_PS_IPOIB = 0x0002,
RDMA_PS_TCP = 0x0106, RDMA_PS_TCP = 0x0106,
RDMA_PS_UDP = 0x0111, RDMA_PS_UDP = 0x0111,
RDMA_PS_SCTP = 0x0183
}; };
struct rdma_addr { struct rdma_addr {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment