Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  drivers/infiniband/core/umem.c

between commit:

  db6c6774af0d ("RDMA/umem: Remove hugetlb flag")

from the rdma tree and commit:

  c041ba1a3294 ("mm/gup: replace get_user_pages_longterm() with FOLL_LONGTERM")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/infiniband/core/umem.c
index 0a23048db523,31191f098e73..000000000000
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@@ -295,10 -189,11 +295,11 @@@ struct ib_umem *ib_umem_get(struct ib_u
  
  	while (npages) {
  		down_read(&mm->mmap_sem);
- 		ret = get_user_pages_longterm(cur_base,
+ 		ret = get_user_pages(cur_base,
  				     min_t(unsigned long, npages,
  					   PAGE_SIZE / sizeof (struct page *)),
- 				     gup_flags, page_list, NULL);
+ 				     gup_flags | FOLL_LONGTERM,
 -				     page_list, vma_list);
++				     page_list, NULL);
  		if (ret < 0) {
  			up_read(&mm->mmap_sem);
  			goto umem_release;