Merge branch 'mr_fix' into git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma...

Update mlx4 to support user MR creation against read-only memory, previously
it required the memory to be writable.

Based on rdma for-rc due to dependencies.

* mr_fix: (2 commits)
  IB/mlx4: Mark user MR as writable if actual virtual memory is writable
  IB/core: Make testing MR flags for writability a static inline function

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

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

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

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

diff --cc drivers/infiniband/hw/i40iw/i40iw_cm.c
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_hw.c
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_main.c
Simple merge

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

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

diff --cc drivers/infiniband/hw/qedr/verbs.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_verbs.c
Simple merge

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