mm-next: manual merge of the akpm/mm-unstable branch

["David Hildenbrand (Arm)" <david@kernel.org>]

Hi,

today's (well, and the last couple of days) mm-next merge of the
akpm/mm-unstable branch tree got a conflict in:

  drivers/infiniband/hw/hfi1/file_ops.c

between the commit:

  62f0f34fbd2b ("IB/hfi1: Fix the PIO_CRED credit-return mmap")

from Linus' tree and commit:

  e7d9f14bb73b ("infiniband: update hfi1 to use remap_vmalloc_range()")

from the akpm/mm-unstable branch.

I resolved the conflicts manually:

diff --cc drivers/infiniband/hw/hfi1/file_ops.c
index 1a36f995c4f6,b02d1f1dbb27..680364fda856
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@@ -325,8 -320,7 +320,8 @@@ static int hfi1_file_mmap(struct file *
  		memaddr = 0;
  	void *memvirt = NULL;
  	dma_addr_t memdma = 0;
- 	u8 subctxt, mapio = 0, vmf = 0, type;
+ 	u8 subctxt, mapio = 0, is_vmalloc = 0, type;
 +	size_t memdmalen = 0;
  	ssize_t memlen = 0;
  	int ret = 0;
  	u16 ctxt;
@@@ -569,16 -546,13 +556,14 @@@
  	}
  
  	vm_flags_reset(vma, flags);
- 	mmap_cdbg(ctxt, subctxt, type, mapio, vmf, memaddr, memvirt, memdma, 
+ 	mmap_cdbg(ctxt, subctxt, type, mapio, is_vmalloc, memaddr, memvirt, memdma,
  		  memlen, vma);
- 	if (vmf) {
- 		vma->vm_pgoff = PFN_DOWN(memaddr);
- 		vma->vm_ops = &vm_ops;
- 		ret = 0;
+ 	if (is_vmalloc) {
+ 		ret = remap_vmalloc_range(vma, memvirt, 0);
  	} else if (memdma) {
  		ret = dma_mmap_coherent(&dd->pcidev->dev, vma,
 -					memvirt, memdma, memlen);
 +					memvirt, memdma,
 +					memdmalen ? memdmalen : memlen);
  	} else if (mapio) {
  		ret = io_remap_pfn_range(vma, vma->vm_start,
  					 PFN_DOWN(memaddr),
-- 
Cheers,

David