linux-kernel - linux-next: manual merge of the akpm-current tree with the rdma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190509153805.6dfbb8ef@canb.auug.org.au>
Date:   Thu, 9 May 2019 15:38:05 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Doug Ledford <dledford@...hat.com>,
        Jason Gunthorpe <jgg@...lanox.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Ira Weiny <ira.weiny@...el.com>,
        Shiraz Saleem <shiraz.saleem@...el.com>
Subject: linux-next: manual merge of the akpm-current tree with the rdma
 tree

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;

Content of type "application/pgp-signature" skipped