Merge tag 'v5.0-rc5' into rdma.git for-next

Linux 5.0-rc5

Needed to merge the include/uapi changes so we have an up to date
single-tree for these files. Patches already posted are also expected to
need this for dependencies.

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/core_priv.h
Simple merge

diff --cc drivers/infiniband/core/device.c
Simple merge

diff --cc drivers/infiniband/core/nldev.c
Simple merge

diff --cc drivers/infiniband/core/umem_odp.c
index eb8a5eb,acb882f..012044f
--- 1/drivers/infiniband/core/umem_odp.c
--- 2/drivers/infiniband/core/umem_odp.c
+++ b/drivers/infiniband/core/umem_odp.c
@@@ -350,9 -349,11 +350,11 @@@ struct ib_umem_odp *ib_alloc_odp_umem(s
        umem->length     = size;
        umem->address    = addr;
        umem->page_shift = PAGE_SHIFT;
 -      umem->writable   = 1;
 +      umem->writable   = root->umem.writable;
        umem->is_odp = 1;
        odp_data->per_mm = per_mm;
+       umem->owning_mm  = per_mm->mm;
+       mmgrab(umem->owning_mm);
  
        mutex_init(&odp_data->umem_mutex);
        init_completion(&odp_data->notifier_completion);

diff --cc drivers/infiniband/core/uverbs_cmd.c
Simple merge

diff --cc drivers/infiniband/core/uverbs_main.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/ud.c
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_srq.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/odp.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

diff --cc drivers/infiniband/hw/mthca/mthca_provider.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_ud.c
Simple merge

diff --cc drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
Simple merge

diff --cc drivers/infiniband/sw/rdmavt/qp.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib.h
Simple merge

diff --cc include/rdma/ib_verbs.h
Simple merge

diff --cc net/rds/ib_send.c
Simple merge