Merge branch 'k.o/for-4.13-rc' into k.o/for-next
authorDoug Ledford <dledford@redhat.com>
Thu, 24 Aug 2017 19:58:26 +0000 (15:58 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 24 Aug 2017 19:58:26 +0000 (15:58 -0400)
commit732912c7386120179bf8f666febc232922e3ee17
treee28dea126ed19c39c3a4eccff36687d5028bda9e
parente3bf14bdc17a8e917f337760cc7cacf3232d7dbc
parentec2558796d25e6024071b6bcb8e11392538d57bf
Merge branch 'k.o/for-4.13-rc' into k.o/for-next

Pick up -rc fixes.

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