From: Jason Gunthorpe <jgg@mellanox.com>
Date: Mon, 4 Feb 2019 21:53:42 +0000 (-0700)
Subject: Merge tag 'v5.0-rc5' into rdma.git for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6a8a2aa62da2fbe51f5449993fd366398048f465;p=linux.git

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.
---

6a8a2aa62da2fbe51f5449993fd366398048f465
diff --cc drivers/infiniband/core/umem_odp.c
index eb8a5eb65bfa9,acb882f279cb9..012044f16d1cd
--- a/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);