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

 Conflicts:
	mm/page_alloc.c

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

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc kernel/cgroup/cpuset.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc mm/page_alloc.c
index 471b052,1423da8..9327a94
--- 1/mm/page_alloc.c
--- 2/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>

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge