Comment 1 for bug 1859269

Get an error on cherry-pick. Might need to pull other RDMA patches.

error: could not apply c043ff2cfb7f... RDMA: Connect between the mmap entry and the umap_priv structure
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

$ git diff
diff --cc drivers/infiniband/core/core_priv.h
index 9d07378b5b42,6be180eb8cb3..000000000000
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@@ -388,4 -387,15 +388,18 @@@ int ib_device_set_netns_put(struct sk_b

  int rdma_nl_net_init(struct rdma_dev_net *rnet);
  void rdma_nl_net_exit(struct rdma_dev_net *rnet);
++<<<<<<< HEAD
++=======
+
+ struct rdma_umap_priv {
+ struct vm_area_struct *vma;
+ struct list_head list;
+ struct rdma_user_mmap_entry *entry;
+ };
+
+ void rdma_umap_priv_init(struct rdma_umap_priv *priv,
+ struct vm_area_struct *vma,
+ struct rdma_user_mmap_entry *entry);
+
++>>>>>>> c043ff2cfb7f... RDMA: Connect between the mmap entry and the umap_priv structure
  #endif /* _CORE_PRIV_H */
diff --cc include/rdma/ib_verbs.h
index 44c52639db55,416e72ea80d9..000000000000
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@@ -2789,18 -2826,21 +2789,34 @@@ void ib_set_client_data(struct ib_devi
  void ib_set_device_ops(struct ib_device *device,
                       const struct ib_device_ops *ops);

- #if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS)
  int rdma_user_mmap_io(struct ib_ucontext *ucontext, struct vm_area_struct *vma,
++<<<<<<< HEAD
 + unsigned long pfn, unsigned long size, pgprot_t prot);
 +#else
 +static inline int rdma_user_mmap_io(struct ib_ucontext *ucontext,
 + struct vm_area_struct *vma,
 + unsigned long pfn, unsigned long size,
 + pgprot_t prot)
 +{
 + return -EINVAL;
 +}