leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BackMerge tag 'v4.14-rc3' into drm-next

Browse Source 
Linux 4.14-rc3

Requested by Daniel for the tracing build fix in fixes.
This commit is contained in:
Dave Airlie
2017-10-03 09:35:04 +10:00
parent 659333de48 9e66317d3c
commit ebec44a245
236 changed files with 2900 additions and 1807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/rdma/ib_user_verbs.h
View File

@@ -261,7 +261,7 @@ struct ib_uverbs_ex_query_device_resp {
struct ib_uverbs_rss_caps rss_caps;
__u32 max_wq_type_rq;
__u32 raw_packet_caps;
struct ib_uverbs_tm_caps xrq_caps;
struct ib_uverbs_tm_caps tm_caps;
};
struct ib_uverbs_query_port {