From: Stephen Rothwell <sfr@canb.auug.org.au> To: Andrew Morton <akpm@linux-foundation.org>, Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com> Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Ira Weiny <ira.weiny@intel.com>, Shiraz Saleem <shiraz.saleem@intel.com> Subject: linux-next: manual merge of the akpm-current tree with the rdma tree Date: Thu, 9 May 2019 15:38:05 +1000 Message-ID: <20190509153805.6dfbb8ef@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1433 bytes --] 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; [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
next reply index Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-09 5:38 Stephen Rothwell [this message] -- strict thread matches above, loose matches on Subject: below -- 2019-05-06 10:48 Stephen Rothwell 2019-05-06 10:37 Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190509153805.6dfbb8ef@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=akpm@linux-foundation.org \ --cc=dledford@redhat.com \ --cc=ira.weiny@intel.com \ --cc=jgg@mellanox.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=shiraz.saleem@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
LKML Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \ linux-kernel@vger.kernel.org public-inbox-index lkml Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git