Merge branch 'linus' into locking/core, to fix up conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 4 Sep 2017 09:01:18 +0000 (11:01 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 4 Sep 2017 09:01:18 +0000 (11:01 +0200)
 Conflicts:
mm/page_alloc.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
drivers/gpu/drm/i915/i915_debugfs.c
include/linux/blkdev.h
include/linux/compiler.h
include/linux/netdevice.h
kernel/cgroup/cpuset.c
kernel/fork.c
mm/page_alloc.c
net/ipv4/udp.c
net/ipv6/udp.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc 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>
diff --cc net/ipv4/udp.c
Simple merge
diff --cc net/ipv6/udp.c
Simple merge