Merge branch 'for-rc' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Tue, 16 Oct 2018 06:01:02 +0000 (00:01 -0600)
committerJason Gunthorpe <jgg@mellanox.com>
Tue, 16 Oct 2018 06:01:02 +0000 (00:01 -0600)
commit59bfc59a68286c5e6824ec3dddcf5232a73c217e
treeccb6b22ba5238ab7abc691ccfccf52ced7e11aea
parented7a01fd3fd77f40b4ef2562b966a5decd8928d2
parentdd9a403495704fc80fb9f399003013ef2be2ee23
Merge branch 'for-rc' into rdma.git for-next

From git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

This is required to resolve dependencies of the next series of RDMA
patches.

The code motion conflicts in drivers/infiniband/core/cache.c were
resolved.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
14 files changed:
drivers/infiniband/core/cache.c
drivers/infiniband/core/cma.c
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/core/uverbs_uapi.c
drivers/infiniband/hw/bnxt_re/main.c
drivers/infiniband/hw/hfi1/chip.c
drivers/infiniband/hw/hfi1/pio.c
drivers/infiniband/hw/hfi1/user_sdma.c
drivers/infiniband/hw/hfi1/verbs.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx5/devx.c
drivers/infiniband/hw/mlx5/mr.c
drivers/infiniband/ulp/srp/ib_srp.c