projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a163afc
8834f56
)
Merge tag 'v5.0-rc5' into rdma.git for-next
author
Jason Gunthorpe
<jgg@mellanox.com>
Mon, 4 Feb 2019 21:53:42 +0000
(14:53 -0700)
committer
Jason Gunthorpe
<jgg@mellanox.com>
Mon, 4 Feb 2019 21:53:42 +0000
(14:53 -0700)
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.
18 files changed:
1
2
drivers/infiniband/core/cma.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/core/core_priv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/core/device.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/core/nldev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/core/umem_odp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/core/uverbs_cmd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/core/uverbs_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/hfi1/ud.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/hns/hns_roce_srq.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/mlx5/odp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/mlx5/qp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/mthca/mthca_provider.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/qib/qib_ud.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/sw/rdmavt/qp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/ulp/ipoib/ipoib.h
patch
|
diff1
|
diff2
|
blob
|
history
include/rdma/ib_verbs.h
patch
|
diff1
|
diff2
|
blob
|
history
net/rds/ib_send.c
patch
|
diff1
|
diff2
|
blob
|
history
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 eb8a5eb65bfa9962373917e89668606f08ddcf4c,acb882f279cb9f5140a9c22b1de89831af6b729f..012044f16d1cd8a595f93c8ef80a906647c9942f
---
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