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

[Stephen Rothwell]

Hi all,

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

  fs/dax.c

between commit:

  cc4a90ac816e ("dax: dax_insert_mapping_entry always succeeds")

from the nvdimm tree and commit:

  aa726309bde7 ("fs/dax.c: add new return type vm_fault_t")

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 fs/dax.c
index d6b01de7f881,821986c61f7e..000000000000
--- a/fs/dax.c
+++ b/fs/dax.c
@@@ -1017,8 -910,9 +1017,8 @@@ static vm_fault_t dax_load_hole(struct 
  {
  	struct inode *inode = mapping->host;
  	unsigned long vaddr = vmf->address;
- 	int ret = VM_FAULT_NOPAGE;
+ 	vm_fault_t ret = VM_FAULT_NOPAGE;
  	struct page *zero_page;
 -	void *entry2;
  	pfn_t pfn;
  
  	zero_page = ZERO_PAGE(0);
@@@ -1028,9 -922,14 +1028,9 @@@
  	}
  
  	pfn = page_to_pfn_t(zero_page);
 -	entry2 = dax_insert_mapping_entry(mapping, vmf, entry, pfn,
 -			RADIX_DAX_ZERO_PAGE, false);
 -	if (IS_ERR(entry2)) {
 -		ret = VM_FAULT_SIGBUS;
 -		goto out;
 -	}
 -
 +	dax_insert_mapping_entry(mapping, vmf, entry, pfn, RADIX_DAX_ZERO_PAGE,
 +			false);
- 	vm_insert_mixed(vmf->vma, vaddr, pfn);
+ 	ret = vmf_insert_mixed(vmf->vma, vaddr, pfn);
  out:
  	trace_dax_load_hole(inode, vmf, ret);
  	return ret;

Attachment: pgpmSCAdD7iQf.pgp
Description: OpenPGP digital signature