Merge branch 'rdma-netlink' into k.o/merge-test
authorDoug Ledford <dledford@redhat.com>
Thu, 10 Aug 2017 18:34:18 +0000 (14:34 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 10 Aug 2017 18:34:18 +0000 (14:34 -0400)
commitd0d62c34fb746eaf68df5b3d6f4877c7d1e6320c
tree8ce9d1f42907ff6b9455b155ca47ebae143f9a1b
parent320438301b85038e995b5a40a24c43cbc0ed4909
parentdb14dff1743e4cd3d840950ad8d735b8957aaf6a
Merge branch 'rdma-netlink' into k.o/merge-test

Conflicts:
include/rdma/ib_verbs.h - Modified a function signature adjacent
to a newly added function signature from a previous merge

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/core/core_priv.h
drivers/infiniband/hw/mlx5/main.c
include/rdma/ib_verbs.h