Subject: linux-next: manual merge of the akpm-current tree with the xen-tip tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 29 Jan 2015 18:28:55 +1100

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/mm.h between commit 667a0a06c99d ("mm: provide a
find_special_page vma operation") from the xen-tip tree and commit
cfd00f5aa195 ("mm: drop vm_ops->remap_pages and
generic_file_remap_pages() stub") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc include/linux/mm.h
index 9269af7349fe,b5e28731a293..000000000000
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -287,17 -284,6 +284,14 @@@ struct vm_operations_struct 
  	struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
  					unsigned long addr);
  #endif
- 	/* called by sys_remap_file_pages() to populate non-linear mapping */
- 	int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
- 			   unsigned long size, pgoff_t pgoff);
 +
 +	/*
 +	 * Called by vm_normal_page() for special PTEs to find the
 +	 * page for @addr.  This is useful if the default behavior
 +	 * (using pte_page()) would not find the correct page.
 +	 */
 +	struct page *(*find_special_page)(struct vm_area_struct *vma,
 +					  unsigned long addr);
  };
  
  struct mmu_gather;