From: Doug Ledford Date: Wed, 14 Dec 2016 19:56:21 +0000 (-0500) Subject: Merge branch 'vmw_pvrdma' into merge-test X-Git-Tag: v4.10-rc1~97^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6f94ba20799b98c8badf047b184fb4cd7bc45e44;p=karo-tx-linux.git Merge branch 'vmw_pvrdma' into merge-test --- 6f94ba20799b98c8badf047b184fb4cd7bc45e44 diff --cc include/uapi/rdma/Kbuild index b54f10d3c1f7,6a8a934c540c..82bdf5626859 --- a/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