Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc include/linux/mm.h
index 87ef1d7730ba52b1ef2c6f8a8a740558b8a788db,f1cd22f2df1ac50438e7d70bb0df85c44580b8d3..a7fef5958730ef49798df55d16cc544c38ec4178
--- 1/include/linux/mm.h
--- 2/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -2080,10 -2137,8 +2137,10 @@@ int remap_pfn_range(struct vm_area_stru
  int vm_insert_page(struct vm_area_struct *, unsigned long addr, struct page *);
  int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr,
                        unsigned long pfn);
 +int vm_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr,
 +                      unsigned long pfn, pgprot_t pgprot);
  int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
-                       unsigned long pfn);
+                       pfn_t pfn);
  int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len);
  
  

diff --cc include/linux/mm_types.h
Simple merge

diff --cc mm/memory.c
index a29f0b90fc561909e75864518e12153a19e0c982,30991f83d0bf54dc537f1927a10883aa5787dd97..5aa4f55eb7865323318fbdfa94bb44e73e0f1ae8
--- 1/mm/memory.c
--- 2/mm/memory.c
+++ b/mm/memory.c
@@@ -1608,10 -1574,10 +1595,10 @@@ int vm_insert_pfn_prot(struct vm_area_s
  
        return ret;
  }
 -EXPORT_SYMBOL(vm_insert_pfn);
 +EXPORT_SYMBOL(vm_insert_pfn_prot);
  
  int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
-                       unsigned long pfn)
+                       pfn_t pfn)
  {
        BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
  

diff --cc mm/mmap.c
Simple merge