matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-10-11 10:47:55 -07:00
parent f53da99ad7 237a52731b
commit 07682b88d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rdma/rdma_netlink.h → include/uapi/rdma/rdma_netlink.h
View File

@ -1,5 +1,5 @@
#ifndef _UAPI_RDMA_NETLINK_H #ifndef _RDMA_NETLINK_H
#define _UAPI_RDMA_NETLINK_H #define _RDMA_NETLINK_H
#include <linux/types.h> #include <linux/types.h>
@ -304,4 +304,4 @@ enum rdma_nldev_attr {
RDMA_NLDEV_ATTR_MAX RDMA_NLDEV_ATTR_MAX
}; };
#endif /* _UAPI_RDMA_NETLINK_H */ #endif /* _RDMA_NETLINK_H */