Merge branch 'k.o/for-4.12' into k.o/for-4.12-rdma-netdevice

mariux64 · Apr 20, 2017 · 23790ba · 23790ba
2 parents 70d40b3 + db1b5dd
commit 23790ba
Show file tree

Hide file tree

Showing 43 changed files with 3,011 additions and 1,531 deletions.
diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
@@ -29,4 +29,5 @@ ib_umad-y :=			user_mad.o
 
 ib_ucm-y :=			ucm.o
 
-ib_uverbs-y :=			uverbs_main.o uverbs_cmd.o uverbs_marshall.o
+ib_uverbs-y :=			uverbs_main.o uverbs_cmd.o uverbs_marshall.o \
+				rdma_core.o uverbs_std_types.o