2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
linux-next/include/uapi/rdma
David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-01-28 10:33:06 -05:00
..
hfi IB/hfi1: Disable header suppression for short packets 2016-12-11 15:25:13 -05:00
cxgb3-abi.h IB/cxgb3: fix misspelling in header guard 2017-01-24 12:20:23 -05:00
cxgb4-abi.h IB/cxgb4: Move user vendor structures 2016-10-07 16:54:35 -04:00
hns-abi.h IB/hns: Move HNS RoCE user vendor structures 2016-12-03 14:23:14 -05:00
ib_user_cm.h UAPI: (Scripted) Disintegrate include/rdma 2012-11-22 00:43:10 -08:00
ib_user_mad.h IB/mad: Add user space RMPP support 2014-08-10 20:36:00 -07:00
ib_user_sa.h UAPI: (Scripted) Disintegrate include/rdma 2012-11-22 00:43:10 -08:00
ib_user_verbs.h IB/uverbs: Extend modify_qp and support packet pacing 2016-12-13 13:39:51 -05:00
Kbuild RDMA/qedr: Add uapi header qedr-abi.h 2017-01-24 15:34:36 -05:00
mlx4-abi.h IB/mlx4: Move user vendor structures 2016-10-07 16:54:36 -04:00
mlx5-abi.h IB/mlx5: Enable Eth VFs to query their min-inline value for user-space 2017-01-24 21:14:06 +02:00
mthca-abi.h IB/mthca: Move user vendor structures 2016-10-07 16:54:37 -04:00
nes-abi.h IB/nes: Move user vendor structures 2016-10-07 16:54:37 -04:00
ocrdma-abi.h IB/ocrdma: Move user vendor structures 2016-10-07 16:54:36 -04:00
qedr-abi.h qedr: Add support for QP verbs 2016-10-14 15:00:10 -04:00
rdma_netlink.h IB/netlink: Add a new local service operation 2016-05-24 14:42:48 -04:00
rdma_user_cm.h rdma UAPI: Use __kernel_sockaddr_storage 2016-12-14 11:42:39 -05:00
rdma_user_rxe.h Soft RoCE driver 2016-08-04 11:13:12 -04:00
vmw_pvrdma-abi.h IB: Add vmw_pvrdma driver 2016-12-14 14:55:10 -05:00