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>

diff --cc include/linux/kcore.h
index 94b561df387701e317e2ec450ebc7181b5bb0802,c843f4a9c512588edc333075cdc3856dc9a582d3..da676cdbd7277e32feb96a56063167afc0964215
--- 1/include/linux/kcore.h
--- 2/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)