From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 28 Mar 2019 09:56:32 +0000 (+0100)
Subject: Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
X-Git-Tag: v5.1-rc3~6^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict

Conflicts:

  include/linux/kcore.h

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

cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb
diff --cc include/linux/kcore.h
index 94b561df3877,c843f4a9c512..da676cdbd727
--- a/include/linux/kcore.h
+++ b/include/linux/kcore.h
@@@ -38,6 -38,14 +38,8 @@@ struct vmcoredd_node 
  
  #ifdef CONFIG_PROC_KCORE
  void __init kclist_add(struct kcore_list *, void *, size_t, int type);
 -static inline
 -void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz)
 -{
 -	m->vaddr = (unsigned long)vaddr;
 -	kclist_add(m, addr, sz, KCORE_REMAP);
 -}
+ 
+ extern int __init register_mem_pfn_is_ram(int (*fn)(unsigned long pfn));
  #else
  static inline
  void kclist_add(struct kcore_list *new, void *addr, size_t size, int type)