Merge tag 'v4.5-rc6' into core/resources, to resolve conflict

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

diff --cc arch/mips/kernel/setup.c
Simple merge

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

diff --cc kernel/memremap.c
index 293309c,b981a7b..97b31c7
--- 1/kernel/memremap.c
--- 2/kernel/memremap.c
+++ b/kernel/memremap.c
@@@ -267,8 -271,8 +272,8 @@@ void *devm_memremap_pages(struct devic
                struct percpu_ref *ref, struct vmem_altmap *altmap)
  {
        int is_ram = region_intersects(res->start, resource_size(res),
 -                      "System RAM");
 +                                     IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE);
-       resource_size_t key, align_start, align_size;
+       resource_size_t key, align_start, align_size, align_end;
        struct dev_pagemap *pgmap;
        struct page_map *page_map;
        unsigned long pfn;

diff --cc kernel/resource.c
Simple merge