projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9032ad7 29c8d9e)
Merge branch 'vmw_pvrdma' into merge-test
authorDoug Ledford <dledford@redhat.com>
Wed, 14 Dec 2016 19:56:21 +0000 (14:56 -0500)
committerDoug Ledford <dledford@redhat.com>
Wed, 14 Dec 2016 19:56:21 +0000 (14:56 -0500)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
include/uapi/rdma/Kbuild patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc include/uapi/rdma/Kbuild
index b54f10d3c1f701f4aa3643589724714b851a25d8,6a8a934c540c926d8a8643b6cd0db4d01301ee98..82bdf5626859989085f831ee3a3a70c1b26ff066
--- 1/include/uapi/rdma/Kbuild
--- 2/include/uapi/rdma/Kbuild
+++ b/include/uapi/rdma/Kbuild
@@@ -14,4 -14,4 +14,5 @@@ header-y += mlx5-abi.
  header-y += mthca-abi.h
  header-y += nes-abi.h
  header-y += ocrdma-abi.h
 +header-y += hns-abi.h
+ header-y += vmw_pvrdma-abi.h