David Ahern 4aba7dc4f4 Merge branch 'iproute2-master' into iproute2-next ... Conflicts: rdma/include/uapi/rdma/rdma_netlink.h Signed-off-by: David Ahern <dsahern@gmail.com>		2018-05-09 21:04:16 -07:00
..
include/uapi/rdma	rdma: add ib header files	2018-05-09 08:14:55 -07:00
.gitignore	rdma: Add basic infrastructure for RDMA tool	2017-08-21 17:07:44 -07:00
Makefile	rdma: Move RDMA UAPI header file to be under RDMA responsibility	2018-03-26 07:02:19 -07:00
dev.c	rdma: Update device capabilities flags	2018-03-08 09:15:28 -08:00
link.c	rdma: Print net device name and index for RDMA device	2018-04-06 09:02:32 -07:00
rdma.c	rdma: initialize the rd struct	2018-04-01 08:18:43 -07:00
rdma.h	rdma: Add CM_ID resource tracking information	2018-04-01 08:18:47 -07:00
res.c	rdma: Add PD resource tracking information	2018-04-01 08:19:01 -07:00
utils.c	rdma: Print net device name and index for RDMA device	2018-04-06 09:02:32 -07:00