From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 4 Sep 2017 09:01:18 +0000 (+0200)
Subject: Merge branch 'linus' into locking/core, to fix up conflicts
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=edc2988c548db05e33b921fed15821010bc74895;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'linus' into locking/core, to fix up conflicts

 Conflicts:
	mm/page_alloc.c

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

edc2988c548db05e33b921fed15821010bc74895
diff --cc mm/page_alloc.c
index 471b0526b876,1423da8dd16f..9327a940e373
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -66,7 -66,7 +66,8 @@@
  #include <linux/kthread.h>
  #include <linux/memcontrol.h>
  #include <linux/ftrace.h>
 +#include <linux/lockdep.h>
+ #include <linux/nmi.h>
  
  #include <asm/sections.h>
  #include <asm/tlbflush.h>