From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 4 Mar 2016 11:12:08 +0000 (+0100)
Subject: Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc94b99636dc7bcccce439a9fb9c00065e2e2627;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

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

bc94b99636dc7bcccce439a9fb9c00065e2e2627
diff --cc kernel/memremap.c
index 293309cac061,b981a7b023f0..97b31c774274
--- a/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;